Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions common-android-app.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ apply plugin: 'com.android.application'
group = 'org.jmonkeyengine'
version = jmeFullVersion

sourceCompatibility = '1.6'

repositories {
mavenCentral()
maven {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ nifty = "1.4.3"

[libraries]

androidx-annotation = "androidx.annotation:annotation:1.7.1"
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0"
android-build-gradle = "com.android.tools.build:gradle:9.1.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"
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"
Expand Down
17 changes: 11 additions & 6 deletions jme3-android-examples/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
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
}

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

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

sourceSets {
main {
java {
Expand All @@ -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')
Expand Down
3 changes: 1 addition & 2 deletions jme3-android-examples/src/main/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="org.jmonkeyengine.jme3androidexamples">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
Loading