Conversation
|
bumping targetSdk is always error-prone :/ |
|
Try without this line first. |
|
The SDK version should be bumped in https://github.com/koreader/koreader-base/blob/master/toolchain/Makefile#L34, and an updated koandroid docker image need to be cut. |
|
|
For the builtin Kotlin / new DSL stuff: --- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,5 @@
//file:noinspection GrDeprecatedAPIUsage
apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
android {
namespace = 'org.koreader.launcher'
@@ -60,8 +59,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
- kotlinOptions {
- jvmTarget = '17'
+ kotlin {
+ compilerOptions {
+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+ }
}
flavorDimensions = [ 'ABI', 'CHANNEL' ]
@@ -121,11 +122,13 @@ android {
androidResources {
noCompress '7z'
}
+}
- applicationVariants.configureEach { variant ->
- variant.outputs.configureEach {
- outputFileName = "NativeActivity.apk"
- }
+androidComponents {
+ onVariants(selector().all()) {
+ outputs.forEach {
+ it.outputFileName.set("NativeActivity.apk")
+ }
}
}
diff --git a/gradle.properties b/gradle.properties
index 1e55d0c..1856671 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,5 +25,3 @@ android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
-android.builtInKotlin=false
-android.newDsl=false |
|
Do we need all those new gradle properties? I've had success locally building and running an ARM APK with just: org.gradle.warning.mode=all
org.gradle.caching=true
org.gradle.configuration-cache=true
org.gradle.configureondemand=true
org.gradle.parallel=true
# Use AndroidX compat libraries
android.useAndroidX=true
# Fallback values used in gradle build
projectName=luajit-launcher
versCode=1
versName=1.0
assetsPath=../assets
libsPath=../libs
# JNI libraries
sevenZipLib=z
# Compilation features
android.defaults.buildfeatures.shaders=false |
|
oh, I saw the builtin Kotlin / new DSL stuff but I thought it was going to be hard. Do you want to commit it as part of this PR?
At least |
What does that do? I can't find any documentation. |
|
I updated my docker image with your latest change from koreader/koreader-base#2286, and now of course the build is broken… |
|
I guess we would need to bump to |
|
OK, I re-tagged it to the previous version, let's forget about |
It seems to build fine on GA wihout it: https://github.com/benoit-pierre/android-luajit-launcher/actions/runs/22800505004. Might be some interaction with some of those other properties… |
|
OK, so linked to
|
|
We can get rid of |
|
And the APK seems to work fine without |
Co-authored-by: Benoit Pierre <benoit.pierre@gmail.com>
superseedes #572
This change is