Skip to content

Commit

Permalink
gradle 8.3.2, kotlin 1.9.20, jdk 17, geopackage-android-map 6.7.4, mg…
Browse files Browse the repository at this point in the history
…rs-android 2.2.3, gars-android 1.2.3
  • Loading branch information
bosborn committed Apr 17, 2024
1 parent b3e803f commit 41d4fe3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// 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()
mavenCentral()
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"
}
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
android.databinding.incremental=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
16 changes: 10 additions & 6 deletions mapcache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -40,6 +41,9 @@ android {
}
}
}
buildFeatures {
buildConfig = true
}
buildTypes {
release {
applicationVariants.all { variant ->
Expand Down Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion mapcache/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="mil.nga.mapcache"
android:installLocation="auto">

<uses-feature
Expand Down

0 comments on commit 41d4fe3

Please sign in to comment.