Skip to content

Commit d107a38

Browse files
committed
Update android devenv
- target_sdk: 35 => 36 - agp: 8.7.3 => 8.10.0 - buildtools 34.0.0 => 35.0.0 - Remove deprecated DSL config: renderscriptDebuggable
1 parent f5740bf commit d107a38

File tree

14 files changed

+18
-23
lines changed

14 files changed

+18
-23
lines changed

1k/build.profiles

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ndk=r23d
5050

5151
# The android target sdk version, @gradle
5252
# as latest as possible
53-
target_sdk=35
53+
target_sdk=36
5454

5555
# The android min sdk version, @gradle
5656
# as min as possible
@@ -62,11 +62,11 @@ gradle=8.13
6262

6363
# The android gradle plugin, @setup.ps1
6464
# as stable as possible, match with build-tools,android-studio
65-
agp=8.7.3
65+
agp=8.10.0
6666

6767
# The android build-tools, @axmol-cmdline @gradle
6868
# as stable as possible, match with agp,android-studio
69-
buildtools=34.0.0
69+
buildtools=35.0.0
7070

7171
# The android studio, @hint
7272
# as latest as possible, but match with agp, build-tools

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
### Bug fixes
44

55
- Fix https://github.com/axmolengine/axmol/issues/2545 install pwsh fail on ubuntu-25.04
6-
- Fix wasm build fail on windows host by @halx99 in https://github.com/axmolengine/axmol/pull/2511
6+
- Fix wasm build fail on windows by @halx99 in https://github.com/axmolengine/axmol/pull/2511
77
- Fix PNG_ARM_NEON_OPT flag by @halx99 in https://github.com/axmolengine/axmol/pull/2512
88
- Fix #2504 play opus audio fail when build with Apple OpenAL.framework by @halx99 in https://github.com/axmolengine/axmol/pull/2506
99
- Fix typo in pkg_check_modules for GTK3. by @j-jorge in https://github.com/axmolengine/axmol/pull/2534
1010
- Fix character, underline and strikethrough drawing over label boundary for Overflow::CLAMP mode by @rh101 in https://github.com/axmolengine/axmol/pull/2515
1111
- Fix for clamped and left-aligned text with certain character sets by @rh101 in https://github.com/axmolengine/axmol/pull/2518
1212
- Fix wasm raise runtime error due to HEAPU8 was not exported by @halx99
13+
- Fix decompressGZ infinite-loop when input data invalid by @halx99 in https://github.com/axmolengine/axmol/pull/2544
1314

1415
### Improvements
1516

1617
- Improve ZipUtils::decompressGZ by @halx99 in https://github.com/axmolengine/axmol/pull/2544
17-
- Fix decompressGZ inf-loop when input data invalid
1818
- Parsing uncompress size and reserve exactly avoid waste memory
1919
- Valid input size
2020
- Improve ogg audio files, detect codec via file header by @halx99 in https://github.com/axmolengine/axmol/pull/2500
@@ -38,6 +38,13 @@
3838
- Improve isolate project axslcc find prompt by @halx99
3939
- Move simd intrinsics detection from 3rd into core by @halx99
4040
- Add minimum version to build docs support by @halx99, now the ci will only build & deploy axmol-2.3+ docs
41+
- Remove deprecated DSL config: renderscriptDebuggable by @halx99 in https://github.com/axmolengine/axmol/pull/2546
42+
43+
### SDKs & Tools updates
44+
45+
- agp: 8.7.3 => 8.10.0
46+
- android target sdk: 35 => 36
47+
- android sdk build tools: 34.0.0 => 35.0.0
4148

4249
### 3rdparty updates
4350

templates/common/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources = true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -82,7 +81,6 @@ android {
8281
debug {
8382
debuggable true
8483
jniDebuggable true
85-
renderscriptDebuggable true
8684
}
8785
}
8886

templates/common/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/cpp-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources = true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/cpp-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/fairygui-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/fairygui-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/live2d-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/live2d-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/lua-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/lua-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/unit-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -83,7 +82,6 @@ android {
8382
debug {
8483
debuggable true
8584
jniDebuggable true
86-
renderscriptDebuggable true
8785
}
8886
}
8987

tests/unit-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

0 commit comments

Comments
 (0)