Skip to content

Commit 53252b8

Browse files
committed
refactor(cli): upgrade android sdk target versions
1 parent 01312aa commit 53252b8

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

src/cli/cli.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,8 +771,13 @@ void signalHandler (int signum) {
771771
#endif
772772

773773
if (signum == SIGINT || signum == SIGTERM) {
774+
if (appStatus == -1) {
775+
log("App result (signal): " + std::to_string(signum));
776+
}
777+
774778
if (appProcess != nullptr) {
775779
appProcess->kill(signum);
780+
appProcess->wait();
776781
appProcess = nullptr;
777782
}
778783

@@ -795,7 +800,6 @@ void signalHandler (int signum) {
795800

796801
if (appStatus == -1) {
797802
appStatus = signum;
798-
log("App result (signal): " + std::to_string(signum));
799803
}
800804

801805
if (signum == SIGTERM || signum == SIGINT) {
@@ -5319,7 +5323,7 @@ int main (int argc, char* argv[]) {
53195323
StringStream sdkmanager;
53205324
StringStream packages;
53215325
StringStream gradlew;
5322-
String ndkVersion = "26.1.10909125";
5326+
String ndkVersion = "27.2.12479018";
53235327
String androidPlatform = "android-34";
53245328

53255329
if (platform.unix) {

src/cli/templates.hh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ constexpr auto gAndroidManifest = R"XML(
478478
xmlns:android="http://schemas.android.com/apk/res/android"
479479
>
480480
<uses-sdk
481-
android:minSdkVersion="26"
481+
android:minSdkVersion="34"
482482
android:targetSdkVersion="34"
483483
/>
484484
@@ -1346,7 +1346,7 @@ buildscript {
13461346
}
13471347
13481348
dependencies {
1349-
classpath 'com.android.tools.build:gradle:7.4.1'
1349+
classpath 'com.android.tools.build:gradle:8.2.0'
13501350
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13511351
}
13521352
}
@@ -1372,22 +1372,26 @@ apply plugin: 'kotlin-android'
13721372
13731373
android {
13741374
compileSdkVersion 34
1375-
ndkVersion "26.1.10909125"
1375+
ndkVersion "27.2.12479018"
13761376
flavorDimensions "default"
13771377
namespace '{{android_bundle_identifier}}'
13781378
13791379
compileOptions {
1380-
sourceCompatibility = JavaVersion.VERSION_17
1381-
targetCompatibility = JavaVersion.VERSION_17
1380+
sourceCompatibility = JavaVersion.VERSION_20
1381+
targetCompatibility = JavaVersion.VERSION_20
1382+
}
1383+
1384+
buildFeatures {
1385+
buildConfig = true
13821386
}
13831387
13841388
kotlinOptions {
1385-
jvmTarget = 17
1389+
jvmTarget = 20
13861390
}
13871391
13881392
defaultConfig {
13891393
applicationId "{{android_bundle_identifier}}"
1390-
minSdkVersion 26
1394+
minSdkVersion 34
13911395
targetSdkVersion 34
13921396
versionCode {{meta_revision}}
13931397
versionName "{{meta_version}}"

0 commit comments

Comments
 (0)