From a786be1b1fca9ec0eb611893cbc1d7d10c8f53b5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 22:17:49 +0000 Subject: [PATCH 1/3] Initial plan From 9788efe6d087a5193f56c6404e4ae90db470c1c2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 3 Apr 2026 22:21:56 +0000 Subject: [PATCH 2/3] 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> --- common-android-app.gradle | 2 -- gradle/libs.versions.toml | 8 ++++---- jme3-android-examples/build.gradle | 17 +++++++++++------ .../src/main/AndroidManifest.xml | 3 +-- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/common-android-app.gradle b/common-android-app.gradle index 35d5ecaf7a..703536bd27 100644 --- a/common-android-app.gradle +++ b/common-android-app.gradle @@ -3,8 +3,6 @@ apply plugin: 'com.android.application' group = 'org.jmonkeyengine' version = jmeFullVersion -sourceCompatibility = '1.6' - repositories { mavenCentral() maven { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 04b318f637..116218142e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,10 +8,10 @@ nifty = "1.4.3" [libraries] -android-build-gradle = "com.android.tools.build:gradle:4.2.0" -android-support-appcompat = "com.android.support:appcompat-v7:28.0.0" -androidx-annotation = "androidx.annotation:annotation:1.3.0" -androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.4.0" +android-build-gradle = "com.android.tools.build:gradle:8.3.2" +androidx-appcompat = "androidx.appcompat:appcompat:1.6.1" +androidx-annotation = "androidx.annotation:annotation:1.7.1" +androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0" gradle-git = "org.ajoberstar:gradle-git:1.2.0" gradle-retrolambda = "me.tatarka:gradle-retrolambda:3.7.1" groovy-test = "org.codehaus.groovy:groovy-test:3.0.24" diff --git a/jme3-android-examples/build.gradle b/jme3-android-examples/build.gradle index c17664e1dd..5a5a076084 100644 --- a/jme3-android-examples/build.gradle +++ b/jme3-android-examples/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion "30.0.2" + namespace "org.jmonkeyengine.jme3androidexamples" + compileSdk 34 - lintOptions { + lint { // Fix nifty gui referencing "java.awt" package. disable 'InvalidPackage' abortOnError false @@ -12,8 +12,8 @@ android { defaultConfig { applicationId "org.jmonkeyengine.jme3androidexamples" - minSdkVersion 15 // Android 4.0.3 ICE CREAM SANDWICH - targetSdkVersion 28 // Android 9 PIE + minSdk 21 // Android 5.0 LOLLIPOP + targetSdk 34 // Android 14 versionCode 1 versionName "1.0" // TODO: from settings.gradle } @@ -25,6 +25,11 @@ android { } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + sourceSets { main { java { @@ -42,7 +47,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation libs.junit4 - implementation libs.android.support.appcompat + implementation libs.androidx.appcompat implementation project(':jme3-core') implementation project(':jme3-android') diff --git a/jme3-android-examples/src/main/AndroidManifest.xml b/jme3-android-examples/src/main/AndroidManifest.xml index cf9cc7c2dc..95789aa79c 100644 --- a/jme3-android-examples/src/main/AndroidManifest.xml +++ b/jme3-android-examples/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Fri, 3 Apr 2026 22:27:05 +0000 Subject: [PATCH 3/3] 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> --- jme3-android-examples/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jme3-android-examples/build.gradle b/jme3-android-examples/build.gradle index 5a5a076084..66c591a931 100644 --- a/jme3-android-examples/build.gradle +++ b/jme3-android-examples/build.gradle @@ -12,7 +12,7 @@ android { defaultConfig { applicationId "org.jmonkeyengine.jme3androidexamples" - minSdk 21 // Android 5.0 LOLLIPOP + minSdk 30 // Android 11 R targetSdk 34 // Android 14 versionCode 1 versionName "1.0" // TODO: from settings.gradle @@ -26,8 +26,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } sourceSets {