SDK 33 updates (#60)

ngageoint · Sep 22, 2023 · be4d92d · be4d92d
1 parent 5fee990
commit be4d92d
Show file tree

Hide file tree

Showing 318 changed files with 10,634 additions and 15,115 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'com.android.application' version '7.1.2' apply false
-    id 'com.android.library' version '7.1.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
-    id 'com.google.dagger.hilt.android' version '2.41' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
+    id 'com.google.dagger.hilt.android' version '2.46.1' apply false
 }
 
 task clean(type: Delete) {

diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,7 @@ android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2048m
 
 # Application properties
-VERSION_CODE=1
+VERSION_CODE=1
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu May 06 13:38:17 MDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/mage/build.gradle b/mage/build.gradle
@@ -5,13 +5,12 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'maven-publish'
     id 'org.ajoberstar.grgit' version '4.1.0'
     id 'com.google.dagger.hilt.android'
 }
 
 group 'mil.nga.giat.mage'
-version '7.2.2'
+version '7.2.1'
 ext {
     sourceRefspec = Grgit.open(currentDir: project.rootDir).head().id
 
@@ -34,7 +33,7 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_API_KEY') ? RELEASE_MAPS
 def googleMapsApiDebugKey = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : ''
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     flavorDimensions "default"
 
     dataBinding {
@@ -47,13 +46,18 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
+    kotlin {
+        jvmToolchain(11)
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+        kotlinOptions {
+            jvmTarget = "11"
+        }
     }
 
     buildFeatures {
@@ -62,15 +66,15 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.1.1"
+        kotlinCompilerExtensionVersion = "1.4.3"
     }
 
     defaultConfig {
         applicationId "mil.nga.giat.mage"
         versionName project.version
         versionCode VERSION_CODE as int
-        minSdkVersion 25
-        targetSdkVersion 32
+        minSdkVersion 27
+        targetSdkVersion 33
         multiDexEnabled true
         resValue "string", "serverURLDefaultValue", serverURL
         resValue "string", "recentMapXYZDefaultValue", "263.0,40.0,3"
@@ -117,15 +121,6 @@ android {
         }
     }
 
-    productFlavors {
-        defaults {
-            // if you build without a flavor gradle will build all flavors
-            // define this flavor to provide a flavor we can build with no overrides
-        }
-        wear {
-            resValue "bool", "isWearBuildDefaultValue", "true"
-        }
-    }
     packagingOptions {
         resources {
             excludes += ['META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE', 'META-INF/NOTICE.txt', 'META-INF/INDEX.LIST']
@@ -142,79 +137,71 @@ android {
     useLibrary 'android.test.runner'
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
+    namespace 'mil.nga.giat.mage'
 }
 
 dependencies {
     ext {
-        lifecycle_version= '2.4.1'
-        room_version = '2.4.2'
-    }
-
-    // this block allows the mage-android-wear-bridge to be pulled in dynamically when that flavor is built
-    gradle.startParameter.taskRequests.each { taskRequest ->
-        taskRequest.args.each { taskName ->
-            if (taskName.toLowerCase().contains("wear")) {
-                //wearCompile project(':bridge') // uncomment me to build wearable locally
-                wearCompile "mil.nga.giat.mage.wearable:bridge:1.0.0" // uncomment me to build wearable.  comment me if building wearable locally.
-            }
-        }
+        lifecycle_version= '2.6.2'
+        room_version = '2.5.2'
     }
 
-    implementation "androidx.core:core-ktx:1.7.0"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
     implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.mediarouter:mediarouter:1.2.6'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.mediarouter:mediarouter:1.6.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.browser:browser:1.4.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation "com.google.android.gms:play-services-maps:18.0.2"
-    implementation 'com.google.maps.android:maps-ktx:3.2.1'
+    implementation 'androidx.browser:browser:1.6.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation "com.google.android.gms:play-services-maps:18.1.0"
+    implementation 'com.google.maps.android:maps-ktx:3.4.0'
 
-    implementation ('androidx.browser:browser:1.4.0')
+    implementation ('androidx.browser:browser:1.6.0')
 
-    implementation 'com.google.dagger:hilt-android:2.41'
-    kapt 'com.google.dagger:hilt-compiler:2.41'
+    implementation 'com.google.dagger:hilt-android:2.46.1'
+    kapt 'com.google.dagger:hilt-compiler:2.46.1'
     implementation 'androidx.hilt:hilt-work:1.0.0'
     kapt 'androidx.hilt:hilt-compiler:1.0.0'
     annotationProcessor 'androidx.hilt:hilt-compiler:1.0.0'
 
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
-    implementation 'androidx.compose.ui:ui:1.1.1'
-    implementation 'androidx.compose.ui:ui-tooling:1.1.1'
-    implementation 'androidx.compose.foundation:foundation:1.1.1'
-    implementation 'androidx.compose.runtime:runtime-livedata:1.1.1'
-    implementation 'androidx.compose.runtime:runtime-rxjava2:1.1.1'
-    implementation 'androidx.compose.material:material:1.1.1'
-    implementation 'androidx.compose.material:material-icons-core:1.1.1'
-    implementation 'androidx.compose.material:material-icons-extended:1.1.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.compose.ui:ui:1.5.1'
+    implementation 'androidx.compose.ui:ui-tooling:1.5.1'
+    implementation 'androidx.compose.foundation:foundation:1.5.1'
+    implementation 'androidx.compose.runtime:runtime-livedata:1.5.1'
+    implementation 'androidx.compose.runtime:runtime-rxjava2:1.5.1'
+    implementation 'androidx.compose.material:material:1.5.1'
+    implementation 'androidx.compose.material:material-icons-core:1.5.1'
+    implementation 'androidx.compose.material:material-icons-extended:1.5.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
     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 "com.google.accompanist:accompanist-swiperefresh:0.19.0"
 
-    implementation('androidx.paging:paging-runtime-ktx:3.1.1')
-    implementation("androidx.paging:paging-compose:1.0.0-alpha14")
+    implementation('androidx.paging:paging-runtime-ktx:3.2.1')
+    implementation("androidx.paging:paging-compose:3.2.1")
 
-    implementation ('androidx.work:work-runtime-ktx:2.7.1')
+    implementation ('androidx.work:work-runtime-ktx:2.8.1')
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.11.0'
 
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-paging:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    implementation 'com.j256.ormlite:ormlite-android:5.6'
+    implementation 'com.j256.ormlite:ormlite-android:6.1'
 
     implementation 'com.google.maps.android:android-maps-utils:2.3.0'
     implementation 'mil.nga.geopackage.map:geopackage-android-map:6.7.1'
@@ -230,11 +217,10 @@ dependencies {
 
     implementation 'com.nulab-inc:zxcvbn:1.2.3'
 
-    implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation "com.google.android.exoplayer:exoplayer:2.17.1"
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation "com.google.android.exoplayer:exoplayer:2.19.1"
 
-    implementation 'com.google.code.gson:gson:2.8.7'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     implementation 'com.google.guava:guava:31.0-android'
     implementation 'org.apache.commons:commons-lang3:3.3.2'