Merge pull request #456 from lucasnlm/new-build

Bump depedencies

about/build.gradle

@@ -68,7 +68,7 @@ dependencies {
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
@@ -77,7 +77,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
-    testImplementation "io.mockk:mockk:1.11.0"
+    testImplementation 'io.mockk:mockk:1.13.5'
 }

app/build.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-if (System.getenv('IS_RELEASE_BUILD')) {
+if (System.getenv('IS_GOOGLE_BUILD')) {
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'com.google.firebase.crashlytics'
     apply plugin: 'com.google.firebase.firebase-perf'
@@ -14,8 +14,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 1703001
-        versionName '17.3.0'
+        versionCode 1704001
+        versionName '17.4.0'
         minSdk 21
         targetSdk 34
         compileSdk 34
@@ -76,21 +76,21 @@ android {
         google {
             dimension 'version'
             applicationId 'dev.lucasnlm.antimine'
-            versionNameSuffix " S"
+            versionNameSuffix ' S'
         }
 
         googleInstant {
-            versionCode 157
+            versionCode 160
             dimension 'version'
             applicationId 'dev.lucasnlm.antimine'
-            versionNameSuffix " I"
+            versionNameSuffix ' I'
         }
 
         foss {
             dimension 'version'
             // There's a typo on F-Droid release :(
             applicationId 'dev.lucanlm.antimine'
-            versionNameSuffix " F"
+            versionNameSuffix ' F'
         }
     }
 }

app/proguard-rules.pro

@@ -46,4 +46,30 @@
 # Material
 -keep class com.google.android.material.** { *; }
 -dontwarn com.google.android.material.**
--dontnote com.google.android.material.**
+-dontnote com.google.android.material.**
+
+# Kryo
+-dontwarn sun.reflect.**
+-dontwarn java.beans.**
+-dontwarn sun.nio.ch.**
+-dontwarn sun.misc.**
+
+# LibGDX
+
+-keep class com.badlogic.gdx.scenes.** { *; }
+
+-dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
+
+# Required if using Gdx-Controllers extension
+-keep class com.badlogic.gdx.controllers.android.AndroidControllers
+
+# Required if using Box2D extension
+-keepclassmembers class com.badlogic.gdx.physics.box2d.World {
+   boolean contactFilter(long, long);
+   void    beginContact(long);
+   void    endContact(long);
+   void    preSolve(long, long);
+   void    postSolve(long, long);
+   boolean reportFixture(long);
+   float   reportRayFixture(long, float, float, float, float, float);
+}

app/src/main/AndroidManifest.xml

@@ -26,10 +26,6 @@
         android:name="android.hardware.faketouch"
         android:required="false" />
 
-    <uses-feature
-        android:name="android.hardware.type.automotive"
-        android:required="false" />
-
     <dist:module dist:instant="true" />
 
     <application

build.gradle

@@ -23,6 +23,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

common/build.gradle

@@ -79,7 +79,7 @@ dependencies {
     kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.11.0'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
@@ -88,7 +88,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.13.5'
 

control/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
@@ -75,7 +75,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.13.5'
 }

donation/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
 
@@ -76,7 +76,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.13.5'
 }

gdx/build.gradle

@@ -59,12 +59,12 @@ dependencies {
     testImplementation 'io.insert-koin:koin-test:3.1.2'
 
     // LibGDX
-    api 'com.badlogicgames.gdx:gdx-backend-android:1.11.0'
-    api 'com.badlogicgames.gdx:gdx:1.11.0'
-    natives 'com.badlogicgames.gdx:gdx-platform:1.11.0:natives-armeabi-v7a'
-    natives 'com.badlogicgames.gdx:gdx-platform:1.11.0:natives-arm64-v8a'
-    natives 'com.badlogicgames.gdx:gdx-platform:1.11.0:natives-x86'
-    natives 'com.badlogicgames.gdx:gdx-platform:1.11.0:natives-x86_64'
+    api 'com.badlogicgames.gdx:gdx-backend-android:1.12.0'
+    api 'com.badlogicgames.gdx:gdx:1.12.0'
+    natives 'com.badlogicgames.gdx:gdx-platform:1.12.0:natives-armeabi-v7a'
+    natives 'com.badlogicgames.gdx:gdx-platform:1.12.0:natives-arm64-v8a'
+    natives 'com.badlogicgames.gdx:gdx-platform:1.12.0:natives-x86'
+    natives 'com.badlogicgames.gdx:gdx-platform:1.12.0:natives-x86_64'
 }
 
 tasks.register('copyAndroidNatives') {

gdx/src/main/java/dev/lucasnlm/antimine/gdx/stages/MinefieldStage.kt

@@ -1,6 +1,7 @@
 package dev.lucasnlm.antimine.gdx.stages
 
 import android.util.SizeF
+import androidx.annotation.Keep
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.math.Vector3
@@ -22,6 +23,7 @@ import dev.lucasnlm.antimine.gdx.toGdxColor
 import dev.lucasnlm.antimine.gdx.toInverseBackOrWhite
 import dev.lucasnlm.antimine.preferences.models.Minefield
 
+@Keep
 class MinefieldStage(
     val screenWidth: Float,
     val screenHeight: Float,

preferences/build.gradle

@@ -41,7 +41,7 @@ dependencies {
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.9.0'
+    testImplementation 'org.mockito:mockito-core:4.6.1'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'io.mockk:mockk:1.13.5'
 }

proprietary/build.gradle

@@ -42,18 +42,18 @@ dependencies {
 
     // Amplitude
     implementation 'com.amplitude:android-sdk:2.32.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
 
     // Google
-    implementation 'com.android.billingclient:billing-ktx:5.2.0'
+    implementation 'com.android.billingclient:billing-ktx:6.0.1'
     implementation 'com.google.android.gms:play-services-instantapps:18.0.1'
     implementation 'com.google.android.gms:play-services-games:23.1.0'
-    implementation 'com.google.android.gms:play-services-auth:20.5.0'
-    implementation 'com.google.android.gms:play-services-ads:22.0.0'
+    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-ads:22.3.0'
     implementation 'com.google.android.play:core-ktx:1.8.1'
 
     // Jetbrains
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3'
 
     // Firebase
     implementation platform('com.google.firebase:firebase-bom:31.4.0')

proprietary/src/main/java/dev/lucasnlm/external/AdMobAdsManager.kt

@@ -3,7 +3,14 @@ package dev.lucasnlm.external
 import android.app.Activity
 import android.content.Context
 import android.view.View
-import com.google.android.gms.ads.*
+import com.google.android.gms.ads.AdError
+import com.google.android.gms.ads.AdListener
+import com.google.android.gms.ads.AdRequest
+import com.google.android.gms.ads.AdSize
+import com.google.android.gms.ads.AdView
+import com.google.android.gms.ads.FullScreenContentCallback
+import com.google.android.gms.ads.LoadAdError
+import com.google.android.gms.ads.MobileAds
 import com.google.android.gms.ads.initialization.AdapterStatus
 import com.google.android.gms.ads.interstitial.InterstitialAd
 import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback