Fix deprecated syntaxes

agateau · Oct 23, 2024 · 20f1be4 · 20f1be4
1 parent c501696
commit 20f1be4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -32,17 +32,17 @@ android {
     Properties versionProps = new Properties()
     versionProps.load(new FileInputStream(file('../version.properties')))
 
-    // Must match ci/install-android-sdk
-    compileSdkVersion 34
     defaultConfig {
         applicationId "com.agateau.tinywheels.android"
-        minSdkVersion 19
-        targetSdkVersion 34
+        minSdk 19
+        targetSdk 34
+        // Must match ci/install-android-sdk
+        compileSdk 34
         versionCode versionProps['VERSION_CODE'].toInteger()
         versionName versionProps['VERSION']
     }
 
-    flavorDimensions 'store'
+    flavorDimensions = ['store']
     productFlavors {
         itchio {
             dimension 'store'

diff --git a/core/build.gradle b/core/build.gradle
@@ -29,7 +29,9 @@ task generateVersionInfoClass {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 compileJava.dependsOn(generateVersionInfoClass)

diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -10,7 +10,9 @@ dependencies {
     implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+}
 sourceSets.main.java.srcDirs = [ "src/" ]
 
 project.ext.mainClassName = "com.agateau.pixelwheels.desktop.DesktopLauncher"

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,5 @@ org.gradle.jvmargs=-Xms128m -Xmx512m
 org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false