From c5a2373e286144c30880cc8784168c10f786255d Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:22:57 -0700 Subject: [PATCH 1/7] Update build.gradle --- examples/example-clientlib-ktx-app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/example-clientlib-ktx-app/build.gradle b/examples/example-clientlib-ktx-app/build.gradle index 4e09195f8..50fe165b3 100644 --- a/examples/example-clientlib-ktx-app/build.gradle +++ b/examples/example-clientlib-ktx-app/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - compose_version = '1.3.3' - compose_material_version = '1.3.1' + compose_version = '1.6.0' + compose_material_version = '1.6.0' compose_compiler_version = '1.5.8' } From a2bb5e7744da24f0cdb990fd4a602cb6dbff3d5a Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:23:51 -0700 Subject: [PATCH 2/7] Update build.gradle --- .../app/build.gradle | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/example-clientlib-ktx-app/app/build.gradle b/examples/example-clientlib-ktx-app/app/build.gradle index 30bd081a5..9647b37a1 100644 --- a/examples/example-clientlib-ktx-app/app/build.gradle +++ b/examples/example-clientlib-ktx-app/app/build.gradle @@ -6,12 +6,12 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.solanamobile.ktxclientsample" minSdk 27 - targetSdk 33 + targetSdk 34 versionCode 1 versionName "1.0" @@ -66,17 +66,17 @@ android { dependencies { implementation project(path: ':clientlib-ktx') - implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.core:core-ktx:1.12.0' implementation "androidx.compose.runtime:runtime:$compose_version" implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" implementation "androidx.compose.material:material:$compose_material_version" implementation "androidx.compose.material:material-icons-core:$compose_material_version" implementation "androidx.compose.material:material-icons-extended:$compose_material_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0' - implementation 'androidx.activity:activity-compose:1.5.0' - implementation "androidx.hilt:hilt-navigation-compose:1.0.0" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0' + implementation 'androidx.activity:activity-compose:1.8.2' + implementation "androidx.hilt:hilt-navigation-compose:1.1.0" implementation "com.google.dagger:hilt-android:2.50" kapt "com.google.dagger:hilt-compiler:2.50" @@ -87,10 +87,10 @@ dependencies { testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" -} \ No newline at end of file +} From 6550868bcb033c92e34173ddbc18d069c73b3ca2 Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:27:00 -0700 Subject: [PATCH 3/7] Update gradle-wrapper.properties --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example-clientlib-ktx-app/gradle/wrapper/gradle-wrapper.properties b/examples/example-clientlib-ktx-app/gradle/wrapper/gradle-wrapper.properties index e6c079b9a..651d53afd 100644 --- a/examples/example-clientlib-ktx-app/gradle/wrapper/gradle-wrapper.properties +++ b/examples/example-clientlib-ktx-app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jul 15 08:42:29 PDT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 85b4bece75f7834faee8183eedb7c6c92fbfeb62 Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:27:19 -0700 Subject: [PATCH 4/7] Update gradle.properties --- examples/example-clientlib-ktx-app/gradle.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/example-clientlib-ktx-app/gradle.properties b/examples/example-clientlib-ktx-app/gradle.properties index cd0519bb2..cccbfe6f2 100644 --- a/examples/example-clientlib-ktx-app/gradle.properties +++ b/examples/example-clientlib-ktx-app/gradle.properties @@ -20,4 +20,6 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false From 6187056d1e22141a62e6cfb8c6e4f1b24770cca8 Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:27:39 -0700 Subject: [PATCH 5/7] Update AndroidManifest.xml --- .../app/src/main/AndroidManifest.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/example-clientlib-ktx-app/app/src/main/AndroidManifest.xml b/examples/example-clientlib-ktx-app/app/src/main/AndroidManifest.xml index 4446c1dd0..a91c66f38 100644 --- a/examples/example-clientlib-ktx-app/app/src/main/AndroidManifest.xml +++ b/examples/example-clientlib-ktx-app/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - \ No newline at end of file + From 4b36e2cb09ac25ee441c8ed22c162b3f96b138c7 Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:30:44 -0700 Subject: [PATCH 6/7] add namespace --- examples/example-clientlib-ktx-app/app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/example-clientlib-ktx-app/app/build.gradle b/examples/example-clientlib-ktx-app/app/build.gradle index 9647b37a1..6458319f0 100644 --- a/examples/example-clientlib-ktx-app/app/build.gradle +++ b/examples/example-clientlib-ktx-app/app/build.gradle @@ -7,6 +7,7 @@ plugins { android { compileSdk 34 + namespace 'com.solanamobile.ktxclientsample' defaultConfig { applicationId "com.solanamobile.ktxclientsample" From 4f06d95a1e1131b1d23a74addd6cf4ec21789a2b Mon Sep 17 00:00:00 2001 From: Marco Martinez Date: Mon, 29 Jan 2024 13:31:18 -0700 Subject: [PATCH 7/7] android plugins --- examples/example-clientlib-ktx-app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/example-clientlib-ktx-app/build.gradle b/examples/example-clientlib-ktx-app/build.gradle index 50fe165b3..6b0081c68 100644 --- a/examples/example-clientlib-ktx-app/build.gradle +++ b/examples/example-clientlib-ktx-app/build.gradle @@ -11,8 +11,8 @@ buildscript { } plugins { - id 'com.android.application' version '7.2.2' apply false - id 'com.android.library' version '7.2.2' apply false + id 'com.android.application' version '8.2.0' apply false + id 'com.android.library' version '8.2.0' apply false id 'org.jetbrains.kotlin.android' version '1.9.22' apply false }