diff --git a/build.gradle b/build.gradle index cd034d86..9c402ab8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.9.20' repositories { google() @@ -8,7 +8,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:8.3.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/gradle.properties b/gradle.properties index 6ad3c903..dbb7bf70 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,2 @@ android.enableJetifier=true android.useAndroidX=true -android.databinding.incremental=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9274f3e1..41168b4b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 20 11:21:15 MDT 2023 +#Wed Apr 17 05:10:50 MDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mapcache/build.gradle b/mapcache/build.gradle index 6f5df095..ef5c461d 100644 --- a/mapcache/build.gradle +++ b/mapcache/build.gradle @@ -4,11 +4,12 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_MAPCACHE_API_KEY') ? REL def googleMapsApiKeyDebug = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : '' android { - compileSdkVersion 34 + compileSdk 34 + namespace 'mil.nga.mapcache' compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } // Verbose logging for debug @@ -40,6 +41,9 @@ android { } } } + buildFeatures { + buildConfig = true + } buildTypes { release { applicationVariants.all { variant -> @@ -93,10 +97,10 @@ dependencies { api 'com.google.android.material:material:1.6.0' api 'androidx.preference:preference:1.2.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - api 'mil.nga.geopackage.map:geopackage-android-map:6.7.3' // comment out to build locally + api 'mil.nga.geopackage.map:geopackage-android-map:6.7.4' // comment out to build locally //api project(':geopackage-map') // uncomment me to build locally - api 'mil.nga.mgrs:mgrs-android:2.2.2' - api 'mil.nga.gars:gars-android:1.2.2' + api 'mil.nga.mgrs:mgrs-android:2.2.3' + api 'mil.nga.gars:gars-android:1.2.3' api 'androidx.multidex:multidex:2.0.1' implementation 'com.google.code.gson:gson:2.8.7' implementation 'androidx.exifinterface:exifinterface:1.3.6' diff --git a/mapcache/src/main/AndroidManifest.xml b/mapcache/src/main/AndroidManifest.xml index aa8459f5..ab692ea8 100644 --- a/mapcache/src/main/AndroidManifest.xml +++ b/mapcache/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@