Merge pull request #337 from cbalster/update_target_sdk_and_minor_cleanup

Update target sdk and minor cleanup

Author: cbalster

.github/workflows/android.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Run Android Linter
         run: ./gradlew lint --stacktrace

app/build.gradle

@@ -21,12 +21,12 @@ android {
         }
     }
 
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         applicationId "de.stephanlindauer.criticalmaps"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 47
         versionName "2.8.2"
         vectorDrawables.useSupportLibrary = true
@@ -50,6 +50,7 @@ android {
             signingConfig signingConfigs.releaseConfig
         }
     }
+
     packagingOptions {
         resources {
             excludes += ['META-INF/services/javax.annotation.processing.Processor']
@@ -68,17 +69,18 @@ android {
     lint {
         warning 'MissingTranslation', 'StringFormatInvalid', 'NewApi', 'InvalidPackage'
     }
+
     namespace 'de.stephanlindauer.criticalmaps'
 }
 
 dependencies {
     implementation 'com.squareup:otto:1.3.8'
     implementation 'org.osmdroid:osmdroid-android:6.1.8'
     implementation 'com.squareup.picasso:picasso:2.8'
-    implementation 'androidx.appcompat:appcompat:1.6.0'
-    implementation 'androidx.annotation:annotation:1.5.0'
-    implementation 'com.google.android.material:material:1.9.0-alpha01'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.annotation:annotation:1.6.0'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
@@ -90,17 +92,27 @@ dependencies {
     implementation "com.google.dagger:dagger:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
 
     errorprone("com.google.errorprone:error_prone_core:2.18.0")
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.google.truth:truth:1.1.3'
-    testImplementation 'org.mockito:mockito-core:5.1.1'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    // https://youtrack.jetbrains.com/issue/KT-54136/Duplicated-classes-cause-build-failure-if-a-dependency-to-kotlin-stdlib-specified-in-an-android-project#focus=Comments-27-6583109.0-0
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }

app/src/debug/res/mipmap-hdpi/ic_launcher_48dp.png

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -28,10 +29,12 @@
         android:name=".App"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
-        android:supportsRtl="true">
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        tools:targetApi="s">
 
         <activity
             android:name="de.stephanlindauer.criticalmaps.Main"