Upgrade to Gradle 7.x and NDK r23b

app/build.gradle

@@ -82,31 +82,43 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    dependenciesInfo {
+        includeInApk true
+        includeInBundle true
+    }
+    buildToolsVersion '30.0.2'
+    ndkVersion '23.1.7779620'
 }
 
 def getFolder(resource) {
-    def binDir = file('src/main/jni/OpenXcom/bin/' + resource);
-    return binDir;
+    def binDir = file('src/main/jni/OpenXcom/bin/' + resource)
+    return binDir
 }
 
 task packBin(description: 'Update data files.') {
-    def index = 0;
+    def index = 0
     ['common', 'standard', 'UFO', 'TFTD'].each { String res ->
-        def zip = task("zip" + res, type: Zip)
-        zip.doFirst { println('Packing ' + res + '...') }
-        zip.destinationDir = file('src/main/assets')
-        zip.archiveName = index.toString() + "_" + res + '.zip'
-        zip.from getFolder(res)
-        zip.into res
-        zip.execute()
-        index++;
+        tasks.register('zip' + res, Zip) {
+            doFirst { println('Packing ' + res + '...') }
+            archiveFileName = index.toString() + '_' + res + '.zip'
+            destinationDirectory = file('src/main/assets')
+            from getFolder(res)
+            into res
+        }
+        dependsOn(tasks.getByName('zip' + res))
+        ++index
+    }
+    tasks.register('zipTranslations', Zip) {
+        doFirst { println('Packing translations...' ) }
+        archiveFileName = '7_translations.zip'
+        destinationDirectory = file('src/main/assets')
+        from getFolder('translations/output')
     }
-    def zipTranslations = task("zipTranslations", type: Zip)
-    zipTranslations.doFirst { println('Packing translations...' )}
-    zipTranslations.destinationDir = file('src/main/assets')
-    zipTranslations.archiveName = '7_translations.zip'
-    zipTranslations.from getFolder('translations/output')
-    zipTranslations.execute()
+    dependsOn(tasks.getByName('zipTranslations'))
 }
 
 gradle.projectsEvaluated {

build.gradle

@@ -1,23 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.10.3'
+wrapper {
+    gradleVersion = '7.3'
 }
 
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath 'org.ajoberstar:grgit:1.1.0'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip