-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dependencies, publish aar and fix testUI
- Loading branch information
1 parent
b43e114
commit d435fda
Showing
8 changed files
with
94 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| buildscript { | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:7.3.0' | ||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10" | ||
| classpath 'com.android.tools.build:gradle:8.2.2' | ||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22" | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| id "java-library" | ||
| id "com.android.library" version '7.3.0' apply false | ||
| id "org.jetbrains.kotlin.android" version "1.7.10" apply false | ||
| id "com.android.library" version '8.2.1' apply false | ||
| id "org.jetbrains.kotlin.android" version "1.9.22" apply false | ||
| id "maven-publish" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| #Sat Mar 02 16:11:54 CET 2024 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,56 @@ | ||
| plugins { | ||
| id 'com.android.application' | ||
| id 'kotlin-android' | ||
| id "com.android.application" | ||
| id "org.jetbrains.kotlin.android" | ||
| } | ||
|
|
||
| android { | ||
| namespace 'com.desweemerl.compose.form.testui' | ||
| compileSdk 33 | ||
| namespace "com.desweemerl.compose.form.testui" | ||
|
|
||
| compileSdk 34 | ||
|
|
||
| defaultConfig { | ||
| minSdk 21 | ||
| targetSdk 32 | ||
| minSdk 26 | ||
| targetSdk 34 | ||
|
|
||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
| composeOptions { | ||
| kotlinCompilerExtensionVersion "1.3.1" | ||
| } | ||
|
|
||
| kotlinOptions { | ||
| jvmTarget = '1.8' | ||
| jvmTarget = "1.8" | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose true | ||
| } | ||
|
|
||
| composeOptions { | ||
| kotlinCompilerExtensionVersion "1.5.9" | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| // Android activity | ||
| def activity_version = "1.6.1" | ||
| def activity_version = "1.8.2" | ||
| implementation "androidx.activity:activity-ktx:$activity_version" | ||
| implementation "androidx.activity:activity-compose:$activity_version" | ||
|
|
||
| // Jetpack Compose / Material3 / FormCompose | ||
| implementation project(":lib") | ||
| implementation platform("androidx.compose:compose-bom:2022.12.00") | ||
| implementation platform("androidx.compose:compose-bom:2024.02.01") | ||
| implementation libs.bundles.material3 | ||
| androidTestImplementation libs.compose.test.junit | ||
| debugImplementation libs.compose.test.manifest | ||
|
|
||
| // ViewModel lifecycle | ||
| def lifecycle_version = "2.5.1" | ||
| def lifecycle_version = "2.7.0" | ||
| implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" | ||
| implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" | ||
| implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" | ||
|
|
||
| testImplementation "org.jetbrains.kotlin:kotlin-test" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters