diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidAudio.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidAudio.java index 63ae7ad5368..26698daf099 100644 --- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidAudio.java +++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidAudio.java @@ -48,16 +48,9 @@ public class DefaultAndroidAudio implements AndroidAudio { private final List musics = new ArrayList(); public DefaultAndroidAudio (Context context, AndroidApplicationConfiguration config) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - AudioAttributes audioAttrib = new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_GAME) - .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).build(); - soundPool = new SoundPool.Builder().setAudioAttributes(audioAttrib).setMaxStreams(config.maxSimultaneousSounds).build(); - } else { - soundPool = new SoundPool(config.maxSimultaneousSounds, AudioManager.STREAM_MUSIC, 0);// srcQuality: the sample-rate - // converter quality. Currently - // has no effect. Use 0 for the - // default. - } + AudioAttributes audioAttrib = new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_GAME) + .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).build(); + soundPool = new SoundPool.Builder().setAudioAttributes(audioAttrib).setMaxStreams(config.maxSimultaneousSounds).build(); manager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE); if (context instanceof Activity) { ((Activity)context).setVolumeControlStream(AudioManager.STREAM_MUSIC); diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index aa37766d1a6..61e34f5ec96 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -34,13 +34,13 @@ versions.lwjgl3 = "3.3.4" versions.jlayer = "1.0.1-gdx" versions.jorbis = "0.0.17" versions.junit = "4.13.2" -versions.androidPlugin = "8.1.2" -versions.multiDex = "2.0.1" -versions.androidCompileSdk = 33 -versions.androidTargetSdk = 33 -versions.androidMinSdk = 19 -versions.androidBuildTools = "33.0.2" -versions.androidFragment = "1.5.7" +versions.androidPlugin = "8.6.1" +versions.androidCompileSdk = 35 +versions.androidTargetSdk = 35 +versions.androidMinSdk = 21 +versions.androidBuildTools = "35.0.0" +versions.androidFragment = "1.8.5" +versions.kotlinBomTests = "2.0.21" versions.javaparser = "2.3.0" versions.spotless = "6.7.1" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b..2c3521197d7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f75..df97d72b8b9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42690..f5feea6d6b1 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 6689b85beec..9b42019c791 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/tests/gdx-tests-android/build.gradle b/tests/gdx-tests-android/build.gradle index 0359ee08da0..3705ba3bf3e 100644 --- a/tests/gdx-tests-android/build.gradle +++ b/tests/gdx-tests-android/build.gradle @@ -55,7 +55,8 @@ dependencies { implementation project(":tests:gdx-tests") implementation project(":backends:gdx-backend-android") implementation libraries.compileOnly.android - implementation "androidx.multidex:multidex:${versions.multiDex}" + // Fix Duplicate class kotlin.collections.jdk8.CollectionsJDK8Kt found in modules kotlin-stdlib-X.X.X.jar + implementation(platform("org.jetbrains.kotlin:kotlin-bom:${versions.kotlinBomTests}")) } android {