diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 5027d1195..e170a36ab 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,10 +14,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3.12.0
         with:
-          java-version: 11
+          java-version: '17'
+          distribution: 'temurin'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
diff --git a/build.gradle b/build.gradle
index 2ef54ea23..151d558b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.3.1'
     }
 }
@@ -21,7 +21,7 @@ allprojects {
 
 tasks {
     wrapper {
-        gradleVersion = "7.0.2"
+        gradleVersion = "8.3"
         distributionType = Wrapper.DistributionType.ALL
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 5465fec0e..e3dfef4e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,5 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e51a..27313fbc8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists