From 6fe08a001f1caa8ae14c83229060a0e728c3d4c2 Mon Sep 17 00:00:00 2001
From: Synced Synapse <synced.synapse@gmail.com>
Date: Mon, 13 Nov 2023 17:54:38 +0000
Subject: [PATCH] Update java compile version

---
 .github/workflows/build.yml | 2 +-
 .travis.yml                 | 2 +-
 Dockerfile                  | 4 ++--
 app/build.gradle            | 8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4761ed3a..c6425fd28 100644
--- 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
index b35a79ea7..a43febc2c 100644
--- 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
index 78f73a826..c40686d2f 100644
--- 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
index 94fec36ee..ccc10a4cc 100644
--- 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)
     }
 }