From d2250b3967f1dacc847b5d3e05d6fddd42cba2d8 Mon Sep 17 00:00:00 2001 From: Feiyun Wang Date: Fri, 19 Nov 2021 15:27:50 +0800 Subject: [PATCH 1/5] Upgrade to Android Gradle Plugin 7.0.3, Gradle 7.3, Android SDK Build Tools 30.0.2 and set ndkVersion 18.1.5063045 (r18b). --- app/build.gradle | 12 ++++++++++-- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index de62149..2f0b04a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,6 +82,16 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + compileOptions { + sourceCompatibility revision + targetCompatibility revision + } + dependenciesInfo { + includeInApk true + includeInBundle true + } + buildToolsVersion '30.0.2' + ndkVersion '18.1.5063045' } def getFolder(resource) { @@ -98,7 +108,6 @@ task packBin(description: 'Update data files.') { zip.archiveName = index.toString() + "_" + res + '.zip' zip.from getFolder(res) zip.into res - zip.execute() index++; } def zipTranslations = task("zipTranslations", type: Zip) @@ -106,7 +115,6 @@ task packBin(description: 'Update data files.') { zipTranslations.destinationDir = file('src/main/assets') zipTranslations.archiveName = '7_translations.zip' zipTranslations.from getFolder('translations/output') - zipTranslations.execute() } gradle.projectsEvaluated { diff --git a/build.gradle b/build.gradle index c9626f1..ea6e3a0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ // 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' } } @@ -18,6 +18,6 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 89f68a2..e735197 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 4d325b9a7a2f068d00146e93974a6a9fd1f3c6b6 Mon Sep 17 00:00:00 2001 From: Feiyun Wang Date: Fri, 19 Nov 2021 15:52:59 +0800 Subject: [PATCH 2/5] Set Java compatibility to VERSION_1_8. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2f0b04a..5180e98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -83,8 +83,8 @@ android { } } compileOptions { - sourceCompatibility revision - targetCompatibility revision + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } dependenciesInfo { includeInApk true From 67a64310fe50b1a22d861ae5acb789c2eddf3229 Mon Sep 17 00:00:00 2001 From: Feiyun Wang Date: Fri, 19 Nov 2021 20:12:24 +0800 Subject: [PATCH 3/5] Upgrade to ndkVersion 23.1.7779620 (r23b). --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5180e98..9715152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -91,7 +91,7 @@ android { includeInBundle true } buildToolsVersion '30.0.2' - ndkVersion '18.1.5063045' + ndkVersion '23.1.7779620' } def getFolder(resource) { From 630df0c9c2000e4c190ccccae15f9507ee2b682e Mon Sep 17 00:00:00 2001 From: Feiyun Wang Date: Sat, 20 Nov 2021 14:13:42 +0800 Subject: [PATCH 4/5] Fix task packBin's dependencies in app/build.gradle --- app/build.gradle | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9715152..9ac0f24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -95,26 +95,29 @@ android { } 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 - index++; + tasks.register('zip' + res, Zip) { + doFirst { println('Packing ' + res + '...') } + archiveFileName = index.toString() + '_' + res + '.zip' + destinationDirectory = file('src/main/assets') + from getFolder(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') + dependsOn(tasks.getByName('zipTranslations')) } gradle.projectsEvaluated { From b1bd9047ced7240b4a129d8bd5698289b0ac37f8 Mon Sep 17 00:00:00 2001 From: Feiyun Wang Date: Mon, 22 Nov 2021 16:12:42 +0800 Subject: [PATCH 5/5] Fix app/build.gradle to add the top level directory in the zip archives --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 9ac0f24..9ee4ed4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -107,6 +107,7 @@ task packBin(description: 'Update data files.') { archiveFileName = index.toString() + '_' + res + '.zip' destinationDirectory = file('src/main/assets') from getFolder(res) + into res } dependsOn(tasks.getByName('zip' + res)) ++index