Skip to content

Commit

Permalink
[Simulator/Android] Bump to latest dependencies and Gradle + remove u…
Browse files Browse the repository at this point in the history
…seless Google plugins
  • Loading branch information
mickbot-92 committed Jul 25, 2024
1 parent d3513a0 commit 63fdb59
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 13 deletions.
14 changes: 7 additions & 7 deletions ion/src/simulator/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -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')
Expand Down Expand Up @@ -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"))
}
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ion/src/simulator/android/src/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="io.github.upsilon.simulator"
android:installLocation="auto">

<uses-feature android:glEsVersion="0x00020000" />
Expand All @@ -23,6 +22,7 @@
android:alwaysRetainTaskState="true"
android:launchMode="singleInstance"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
android:exported="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 63fdb59

Please sign in to comment.