From 0eb3486eb91e5d6697131ca0c72e6a9bb8480d0e Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 2 Nov 2022 15:16:30 -0300 Subject: [PATCH 1/3] update lifecycle libs --- app/build.gradle | 23 +++++++++++++++-------- build.gradle | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 41ac6c6b6..eeea88ed8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -133,15 +133,22 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.viewpager2:viewpager2:1.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' - implementation "androidx.room:room-runtime:$room_version" - implementation "com.google.dagger:hilt-android:$hilt_version" - implementation "androidx.datastore:datastore:$datastore_version" - kapt "androidx.room:room-compiler:$room_version" - kapt "com.google.dagger:hilt-compiler:$hilt_version" - //OSMDROID, mgrs, + // Lifecycle + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version" + + implementation "androidx.room:room-runtime:$room_version" + kapt "androidx.room:room-compiler:$room_version" + implementation "com.google.dagger:hilt-android:$hilt_version" + kapt "com.google.dagger:hilt-compiler:$hilt_version" + implementation "androidx.datastore:datastore:$datastore_version" + + // Osmdroid & Maps implementation 'org.osmdroid:osmdroid-android:6.1.14' implementation 'com.github.MKergall:osmbonuspack:6.9.0' implementation 'org.osmdroid:osmdroid-wms:6.1.14' diff --git a/build.gradle b/build.gradle index 1c9ce9d1a..5e2dbbaff 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { ext { kotlin_version = '1.6.21' coroutines_version = '1.6.0' + lifecycle_version = "2.5.1" room_version = '2.4.3' hilt_version = '2.40.5' datastore_version = '1.0.0' From 3e1416f7ceeb59c64ad27d8996f495b35af14af7 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 2 Nov 2022 15:34:56 -0300 Subject: [PATCH 2/3] add compose libs --- app/build.gradle | 22 ++++++++++++++++------ build.gradle | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eeea88ed8..7660534cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,6 @@ android { pseudoLocalesEnabled true } } - defaultConfig { // We have to list all translated languages here, because some of our libs have bogus languages that google play // doesn't like and we need to strip them (gr) @@ -73,26 +72,27 @@ android { // abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } } - buildFeatures { viewBinding true } - + buildFeatures { + compose true + } // Set both the Java and Kotlin compilers to target Java 8. - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { jvmTarget = "1.8" freeCompilerArgs += ['-opt-in=kotlin.RequiresOptIn'] } + composeOptions { + kotlinCompilerExtensionVersion compose_version + } lint { abortOnError false } - } play { @@ -148,6 +148,16 @@ dependencies { kapt "com.google.dagger:hilt-compiler:$hilt_version" implementation "androidx.datastore:datastore:$datastore_version" + // Compose + implementation "androidx.compose.runtime:runtime:$compose_version" + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.foundation:foundation:$compose_version" + implementation "androidx.compose.foundation:foundation-layout:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.runtime:runtime-livedata:$compose_version" + implementation "androidx.compose.ui:ui-tooling:$compose_version" + implementation "com.google.android.material:compose-theme-adapter:1.1.14" + // Osmdroid & Maps implementation 'org.osmdroid:osmdroid-android:6.1.14' implementation 'com.github.MKergall:osmbonuspack:6.9.0' diff --git a/build.gradle b/build.gradle index 5e2dbbaff..c76a2ce58 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { room_version = '2.4.3' hilt_version = '2.40.5' datastore_version = '1.0.0' + compose_version = '1.2.0-rc02' } repositories { From 4c46f2ae1c931c4cd3fe502f0a466f179f007b59 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 2 Nov 2022 15:38:26 -0300 Subject: [PATCH 3/3] upgrade gradle libs --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7660534cc..bbb20451c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,6 +93,7 @@ android { lint { abortOnError false } + namespace 'com.geeksville.mesh' } play { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bbd202024..936141e97 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/build.gradle b/build.gradle index c76a2ce58..b439eed88 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5e7360528..3a50cc23e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip