Skip to content

Commit d4b7164

Browse files
authored
feat: Kotlin 2 + Gradle 8+ (#1812)
1 parent 109bdd9 commit d4b7164

File tree

20 files changed

+765
-277
lines changed

20 files changed

+765
-277
lines changed

build.sh

+23-22
Original file line numberDiff line numberDiff line change
@@ -50,33 +50,34 @@ fi
5050
./gradlew runSbgTests
5151

5252
for emulator in $listOfEmulators; do
53-
echo "Start emulator $emulator"
54-
$ANDROID_HOME/emulator/emulator -avd ${emulator} -verbose -wipe-data -gpu on&
55-
find ~/.android/avd/${emulator}.avd -type f -name 'config.ini' -exec cat {} +
53+
echo "Start emulator $emulator"
54+
$ANDROID_HOME/emulator/emulator -avd ${emulator} -verbose -wipe-data -gpu on&
55+
find ~/.android/avd/${emulator}.avd -type f -name 'config.ini' -exec cat {} +
5656

57-
echo "Run Android Runtime unit tests for $emulator"
58-
$ANDROID_HOME/platform-tools/adb wait-for-device
59-
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat -c
60-
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog.txt&
61-
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog$emulator.txt&
57+
echo "Run Android Runtime unit tests for $emulator"
58+
$ANDROID_HOME/platform-tools/adb wait-for-device
59+
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat -c
60+
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog.txt&
61+
$ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog$emulator.txt&
6262

63-
if [ "$1" != 'unit_tests_only' ]; then
64-
./gradlew runtests
65-
else
66-
./gradlew runtests -PonlyX86
67-
fi
63+
if [ "$1" != 'unit_tests_only' ]; then
64+
./gradlew runtests
65+
else
66+
./gradlew runtests -PonlyX86
67+
fi
6868

69-
echo "Rename unit test result"
70-
(
71-
cd ./test-app/dist
72-
mv android_unit_test_results.xml $emulator.xml
73-
)
69+
echo "Rename unit test result"
70+
(
71+
cd ./test-app/dist
72+
mv android_unit_test_results.xml $emulator.xml
73+
)
7474

75-
echo "Stopping running emulators"
76-
for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
77-
for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
78-
for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
75+
echo "Stopping running emulators"
76+
for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
77+
for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
78+
for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done
7979
done
8080

8181
echo $cwd
8282
cd $cwd
83+

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@nativescript/android",
33
"description": "NativeScript for Android using v8",
4-
"version": "8.7.0",
4+
"version": "8.8.0-alpha.11",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/NativeScript/android.git"
@@ -10,20 +10,20 @@
1010
"**/*"
1111
],
1212
"version_info": {
13-
"v8": "8.3.110.9",
14-
"gradle": "7.6",
15-
"gradleAndroid": "7.4.2",
16-
"ndk": "r21",
17-
"ndkApiLevel": "22",
13+
"v8": "10.3.22.0",
14+
"gradle": "8.4",
15+
"gradleAndroid": "8.3.2",
16+
"ndk": "r23c",
17+
"ndkApiLevel": "17",
1818
"minSdk": "17",
19-
"compileSdk": "32",
20-
"buildTools": "32.0.0",
21-
"kotlin": "1.7.10"
19+
"compileSdk": "34",
20+
"buildTools": "34.0.0",
21+
"kotlin": "2.0.0"
2222
},
2323
"// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
2424
"gradle": {
25-
"version": "7.6",
26-
"android": "7.4.2"
25+
"version": "8.4",
26+
"android": "8.3.2"
2727
},
2828
"scripts": {
2929
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",

0 commit comments

Comments
 (0)