Merge pull request #47 from ngageoint/develop

Release 2.1.1

Author: jclark118

.github/workflows/build.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v1
-    - name: set up JDK 1.8
+    - name: set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: mobsfscan
       uses: MobSF/mobsfscan@0.0.8
       with:

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

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-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

mapcache/build.gradle

@@ -4,22 +4,19 @@ def googleMapsApiReleaseKey = hasProperty('RELEASE_MAPS_MAPCACHE_API_KEY') ? REL
 def googleMapsApiKeyDebug = hasProperty('DEBUG_MAPS_API_KEY') ? DEBUG_MAPS_API_KEY : ''
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     defaultConfig {
         applicationId "mil.nga.mapcache"
         resValue "string", "applicationId", applicationId
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 38
-        versionName '2.1.0'
+        targetSdkVersion 31
+        versionCode 39
+        versionName '2.1.1'
         multiDexEnabled true
     }
     buildTypes {
@@ -56,13 +53,14 @@ dependencies {
     api 'com.google.android.material:material:1.0.0'
     api 'androidx.preference:preference:1.1.1'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    api 'mil.nga.geopackage.map:geopackage-android-map:6.0.2' // comment out to build locally
+    api 'mil.nga.geopackage.map:geopackage-android-map:6.1.3' // comment out to build locally
     //api project(':geopackage-map') // uncomment me to build locally
     api 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'com.google.android.gms:play-services-location:18.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
+    implementation 'org.locationtech.jts:jts-core:1.18.2'
     testImplementation 'androidx.multidex:multidex:2.0.1'
     testImplementation 'junit:junit:4.13.1'
     implementation 'com.github.matomo-org:matomo-sdk-android:v2.0.0'

mapcache/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
             android:name=".MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
+            android:exported="true"
             android:screenOrientation="unspecified">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -101,6 +102,9 @@
         <activity
             android:name=".preferences.TileUrlActivity"
             android:label="@string/title_activity_saved_tile_urls" />
+        <activity
+            android:name=".preferences.BasemapSettingsActivity"
+            android:label="BasemapSettingsActivity" />
         <activity
             android:name=".preferences.PrivacyPolicyActivity"
             android:label="@string/title_activity_privacy_policy" />