diff --git a/ion/src/simulator/android/build.gradle b/ion/src/simulator/android/build.gradle index 51db00a1327..dd9ca17a381 100644 --- a/ion/src/simulator/android/build.gradle +++ b/ion/src/simulator/android/build.gradle @@ -16,8 +16,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.android.tools.build:gradle:8.5.1' } } @@ -32,11 +31,12 @@ allprojects { apply plugin: 'com.android.application' android { - compileSdkVersion 29 + namespace = "io.github.upsilon.simulator" + compileSdkVersion 34 defaultConfig { applicationId "io.github.upsilon.simulator" - minSdkVersion 16 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 33 def (major, minor, patch) = System.getenv('OMEGA_VERSION').toLowerCase().tokenize('.').collect{it.toInteger()} versionCode major*1000000 + minor*10000 + patch * 100 versionName System.getenv('OMEGA_VERSION') @@ -77,6 +77,6 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "androidx.appcompat:appcompat:1.0.2" - implementation "com.google.android.gms:play-services-analytics:16.0.7" + implementation "androidx.appcompat:appcompat:1.7.0" + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) } diff --git a/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties b/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties index 44e7c4d1d7b..19cfad969ba 100644 --- a/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties +++ b/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ion/src/simulator/android/src/AndroidManifest.xml b/ion/src/simulator/android/src/AndroidManifest.xml index 6472b33c231..45e5a672b23 100644 --- a/ion/src/simulator/android/src/AndroidManifest.xml +++ b/ion/src/simulator/android/src/AndroidManifest.xml @@ -1,6 +1,5 @@ @@ -23,6 +22,7 @@ android:alwaysRetainTaskState="true" android:launchMode="singleInstance" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" + android:exported="true" > diff --git a/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java b/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java index f1d3716b6df..7b1a9c53b07 100644 --- a/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java +++ b/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java @@ -11,10 +11,6 @@ import android.provider.Settings; import android.util.Log; -import com.google.android.gms.analytics.GoogleAnalytics; -import com.google.android.gms.analytics.Tracker; -import com.google.android.gms.analytics.HitBuilders; - import org.libsdl.app.SDLActivity; import org.libsdl.app.SDL;