Skip to content

Commit 9e4dda9

Browse files
authored
Merge branch 'master' into copilot/upgrade-android-buildscripts
2 parents 9788efe + 994c552 commit 9e4dda9

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

gradle/libs.versions.toml

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

99
[libraries]
1010

11-
android-build-gradle = "com.android.tools.build:gradle:8.3.2"
12-
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
1311
androidx-annotation = "androidx.annotation:annotation:1.7.1"
1412
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0"
13+
android-build-gradle = "com.android.tools.build:gradle:9.1.0"
14+
android-support-appcompat = "com.android.support:appcompat-v7:28.0.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"
18-
gson = "com.google.code.gson:gson:2.9.1"
18+
gson = "com.google.code.gson:gson:2.13.2"
1919
j-ogg-vorbis = "com.github.stephengold:j-ogg-vorbis:1.0.6"
2020
jbullet = "com.github.stephengold:jbullet:1.0.3"
2121
jinput = "net.java.jinput:jinput:2.0.9"

jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public void writeImageFile(OutputStream outStream, String format, ByteBuffer ima
7676

7777
@Override
7878
public JmeContext newContext(AppSettings settings, Type contextType) {
79-
if (settings.getAudioRenderer().equals(AppSettings.ANDROID_MEDIAPLAYER)) {
79+
if (settings.getAudioRenderer() == null) {
80+
audioRendererType = null;
81+
} else if (settings.getAudioRenderer().equals(AppSettings.ANDROID_MEDIAPLAYER)) {
8082
audioRendererType = AppSettings.ANDROID_MEDIAPLAYER;
8183
} else if (settings.getAudioRenderer().equals(AppSettings.ANDROID_OPENAL_SOFT)) {
8284
audioRendererType = AppSettings.ANDROID_OPENAL_SOFT;
@@ -92,6 +94,9 @@ public JmeContext newContext(AppSettings settings, Type contextType) {
9294

9395
@Override
9496
public AudioRenderer newAudioRenderer(AppSettings settings) {
97+
if (settings.getAudioRenderer() == null) {
98+
return null;
99+
}
95100
ALC alc = new AndroidALC();
96101
AL al = new AndroidAL();
97102
EFX efx = new AndroidEFX();

jme3-screenshot-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation project(':jme3-lwjgl3')
1515
implementation project(':jme3-plugins')
1616

17-
implementation 'com.aventstack:extentreports:5.1.1'
17+
implementation 'com.aventstack:extentreports:5.1.2'
1818
implementation platform('org.junit:junit-bom:5.9.1')
1919
implementation 'org.junit.jupiter:junit-jupiter'
2020
testRuntimeOnly project(':jme3-testdata')

0 commit comments

Comments
 (0)