Skip to content

Commit eb34d93

Browse files
Copilotriccardobl
andauthored
Upgrade Android ecosystem and dependencies to android 11+ (#2679)
* Initial plan * Upgrade Android build scripts to use newer ecosystem dependencies Agent-Logs-Url: https://github.com/jMonkeyEngine/jmonkeyengine/sessions/0bac661f-576c-4cfa-85ff-80a2adcd1e24 Co-authored-by: riccardobl <4943530+riccardobl@users.noreply.github.com> * Target Android 11+ (API 30) with Java 11 Agent-Logs-Url: https://github.com/jMonkeyEngine/jmonkeyengine/sessions/89d6ac36-7802-42b9-bcf1-03c6108beeb7 Co-authored-by: riccardobl <4943530+riccardobl@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: riccardobl <4943530+riccardobl@users.noreply.github.com> Co-authored-by: Riccardo Balbo <riccardo0blb@gmail.com>
1 parent 53d7bba commit eb34d93

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

common-android-app.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ apply plugin: 'com.android.application'
33
group = 'org.jmonkeyengine'
44
version = jmeFullVersion
55

6-
sourceCompatibility = '1.6'
7-
86
repositories {
97
mavenCentral()
108
maven {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ nifty = "1.4.3"
88

99
[libraries]
1010

11+
androidx-annotation = "androidx.annotation:annotation:1.7.1"
12+
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0"
1113
android-build-gradle = "com.android.tools.build:gradle:9.1.0"
1214
android-support-appcompat = "com.android.support:appcompat-v7:28.0.0"
13-
androidx-annotation = "androidx.annotation:annotation:1.3.0"
14-
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.4.0"
1515
gradle-git = "org.ajoberstar:gradle-git:1.2.0"
1616
gradle-retrolambda = "me.tatarka:gradle-retrolambda:3.7.1"
1717
groovy-test = "org.codehaus.groovy:groovy-test:3.0.24"

jme3-android-examples/build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
5-
buildToolsVersion "30.0.2"
4+
namespace "org.jmonkeyengine.jme3androidexamples"
5+
compileSdk 34
66

7-
lintOptions {
7+
lint {
88
// Fix nifty gui referencing "java.awt" package.
99
disable 'InvalidPackage'
1010
abortOnError false
1111
}
1212

1313
defaultConfig {
1414
applicationId "org.jmonkeyengine.jme3androidexamples"
15-
minSdkVersion 15 // Android 4.0.3 ICE CREAM SANDWICH
16-
targetSdkVersion 28 // Android 9 PIE
15+
minSdk 30 // Android 11 R
16+
targetSdk 34 // Android 14
1717
versionCode 1
1818
versionName "1.0" // TODO: from settings.gradle
1919
}
@@ -25,6 +25,11 @@ android {
2525
}
2626
}
2727

28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_11
30+
targetCompatibility JavaVersion.VERSION_11
31+
}
32+
2833
sourceSets {
2934
main {
3035
java {
@@ -42,7 +47,7 @@ android {
4247
dependencies {
4348
implementation fileTree(dir: 'libs', include: ['*.jar'])
4449
testImplementation libs.junit4
45-
implementation libs.android.support.appcompat
50+
implementation libs.androidx.appcompat
4651

4752
implementation project(':jme3-core')
4853
implementation project(':jme3-android')

jme3-android-examples/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.jmonkeyengine.jme3androidexamples">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

0 commit comments

Comments
 (0)