Update java compile version

xbmc · Nov 13, 2023 · 026667b · 026667b
1 parent 7213763
commit 026667b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1.0.4

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: android
-jdk: oraclejdk8
+jdk: oraclejdk17
 sudo: false
 
 env:

diff --git a/Dockerfile b/Dockerfile
@@ -4,14 +4,14 @@
 FROM ubuntu:20.04
 
 # Install Java
-ARG JDK_VERSION=11
+ARG JDK_VERSION=17
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openjdk-${JDK_VERSION}-jdk && \
     apt-get install -y --no-install-recommends git wget unzip
 
 # Install Gradle
 # https://services.gradle.org/distributions/
-ARG GRADLE_VERSION=7.3.3
+ARG GRADLE_VERSION=8.4
 ARG GRADLE_DIST=bin
 RUN cd /opt && \
     wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip && \

diff --git a/app/build.gradle b/app/build.gradle
@@ -88,9 +88,11 @@ android {
     }
     namespace 'org.xbmc.kore'
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }