Update build for Android 35 API targeting.

Cleanup easily fixed gradle deprecation warnings.

Author: rtibbles

python-for-android/dists/kolibri/build.gradle

@@ -2,20 +2,17 @@
 buildscript {
     repositories {
        google()
-       jcenter()
+       mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
-        flatDir {
-            dirs 'libs'
-        }
+        mavenCentral()
     }
 }
 
@@ -24,7 +21,9 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdk 34
+    namespace = 'org.learningequality.Kolibri'
+    compileSdkVersion = 35
+    buildToolsVersion = "35.0.0"
     def versionPropsFile = file('version.properties')
     Properties versionProps = new Properties()
 
@@ -45,21 +44,23 @@ android {
     def nameNoDebug = name.replace("-debug", "")
 
     defaultConfig {
-        minSdkVersion 23
-        targetSdk 34
-        versionCode code
-        versionName name
+        minSdkVersion = 23
+        targetSdk = 35
+        versionCode = code
+        versionName = name
         manifestPlaceholders = [:]
-        multiDexEnabled true
+        multiDexEnabled = true
         setProperty("archivesBaseName", "kolibri-$nameNoDebug")
+        buildConfigField "String", "VERSION_CODE", "\"${code.toString()}\""
     }
 
     packagingOptions {
         jniLibs {
             useLegacyPackaging = true
         }
-        exclude 'lib/**/gdbserver'
-        exclude 'lib/**/gdb.setup'
+        resources {
+            excludes += ['lib/**/gdbserver', 'lib/**/gdb.setup']
+        }
     }
 
     signingConfigs {
@@ -73,30 +74,32 @@ android {
 
     buildTypes {
         debug {
-            debuggable true
+            debuggable = true
         }
         release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
 
     compileOptions {
 
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
 
     }
 
     sourceSets {
         main {
             jniLibs.srcDir 'libs'
-            java {
-                }
         }
     }
 
-    aaptOptions {
-        noCompress "tflite"
+
+    buildFeatures {
+        buildConfig = true
+    }
+    androidResources {
+        noCompress 'tflite'
     }
 
 }

python-for-android/dists/kolibri/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.learningequality.Kolibri"
     android:installLocation="auto"
     >
 
@@ -38,7 +37,6 @@
         android:theme="@android:style/Theme.NoTitleBar"
         android:hardwareAccelerated="true"
         android:usesCleartextTraffic="true"
-        android:extractNativeLibs="true"
         >
 
 
@@ -82,14 +80,14 @@
             android:name="androidx.work.multiprocess.RemoteWorkManagerService"
             android:process="@string/task_worker_process"
             android:exported="true"
-            tools:replace="android:process, android:exported"
+            tools:replace="android:exported"
             />
 
         <service
             android:name="androidx.work.impl.background.systemjob.SystemJobService"
             android:process="@string/task_worker_process"
             android:exported="true"
-            tools:replace="android:process, android:exported"
+            tools:replace="android:exported"
             />
 
         <service

python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonUtil.java

@@ -23,7 +23,7 @@ public class PythonUtil {
     // We read this directly from the VERSION_CODE,
     // so that any upgrade of the app causes the Python
     // code to be extracted again.
-    private static final String PrivateVersion = Integer.toString(BuildConfig.VERSION_CODE);
+    private static final String PrivateVersion = BuildConfig.VERSION_CODE;
 
     protected static void addLibraryIfExists(ArrayList<String> libsList, String pattern, File libsDir) {
         // pattern should be the name of the lib file, without the