X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fxscreensaver%2Fbuild.gradle;h=f0ff9a3e7b5a0624cc19985a797692089e961bc4;hp=6d1151ff1016792efdd3ea96d84aa81e287e9a13;hb=refs%2Fheads%2Fmaster;hpb=78add6e627ee5f10e1fa6f3852602ea5066eee5a

diff --git a/android/xscreensaver/build.gradle b/android/xscreensaver/build.gradle
index 6d1151ff..e7529c46 100644
--- a/android/xscreensaver/build.gradle
+++ b/android/xscreensaver/build.gradle
@@ -1,15 +1,16 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 dependencies {
-    compile fileTree(include: '*.jar', dir: 'libs')
+    implementation fileTree(include: '*.jar', dir: 'libs')
+    implementation "com.android.support:support-v4:27.1.1"
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 34
+    buildToolsVersion "34.0.0"
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     sourceSets {
         main {
@@ -20,13 +21,17 @@ android {
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
+
+            // "The jni block in an android sourceSet does nothing, and will
+            // be removed in Android Gradle Plugin version 8.0.0."
+
             // jniLibs.srcDirs = ['jni']
             jniLibs.srcDirs = ['libs']
             jni.srcDirs = [] // disable automatic ndk-build call
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
@@ -95,14 +100,19 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 21
+        // Previous applicationId was "org.jwz.xscreensaver" but I had
+        // to change it because I managed to lose the signing key...
+        // Note that the Java class tree is still "org.jwz.xscreensaver".
+        applicationId "org.jwz.android.xscreensaver"
+        namespace "org.jwz.xscreensaver"
+        minSdkVersion 18
+        targetSdkVersion 33
     }
     productFlavors {
     }
     buildTypes {
         debug {
-            jniDebuggable true
+            debuggable true
         }
     }
 }