From 31f8501bb902815cfed8e1cd123fe8b6de2cb757 Mon Sep 17 00:00:00 2001 From: farfromrefuge Date: Fri, 21 Jun 2024 00:24:58 +0200 Subject: [PATCH 1/6] fix: correctly load ts_helpers.js in workers (#1798) * fix: correctly load ts_helpers.js in workers * chore: remove redundant arguments * feat: don't polyfill JavaProxy on worker * chore: remove unneeded appDir --------- Co-authored-by: farfromrefuge <> Co-authored-by: Eduardo Speroni --- test-app/app/src/main/assets/internal/ts_helpers.js | 4 +++- test-app/app/src/main/java/com/tns/RuntimeHelper.java | 2 +- test-app/runtime/src/main/cpp/Runtime.cpp | 1 + test-app/runtime/src/main/java/com/tns/Runtime.java | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test-app/app/src/main/assets/internal/ts_helpers.js b/test-app/app/src/main/assets/internal/ts_helpers.js index 1a0625f45..d1860dc47 100644 --- a/test-app/app/src/main/assets/internal/ts_helpers.js +++ b/test-app/app/src/main/assets/internal/ts_helpers.js @@ -170,6 +170,8 @@ Object.defineProperty(global, "__extends", { value: __extends }); Object.defineProperty(global, "__decorate", { value: __decorate }); - global.JavaProxy = JavaProxy; + if (!global.__ns__worker) { + global.JavaProxy = JavaProxy; + } global.Interfaces = Interfaces; })() \ No newline at end of file diff --git a/test-app/app/src/main/java/com/tns/RuntimeHelper.java b/test-app/app/src/main/java/com/tns/RuntimeHelper.java index 423cc44b1..90a64f16e 100644 --- a/test-app/app/src/main/java/com/tns/RuntimeHelper.java +++ b/test-app/app/src/main/java/com/tns/RuntimeHelper.java @@ -190,7 +190,7 @@ public static Runtime initRuntime(Context context) { waitForLiveSync(context); } - runtime.runScript(new File(appDir, "internal/ts_helpers.js")); +// runtime.runScript(new File(appDir, "internal/ts_helpers.js")); File javaClassesModule = new File(appDir, "app/tns-java-classes.js"); if (javaClassesModule.exists()) { diff --git a/test-app/runtime/src/main/cpp/Runtime.cpp b/test-app/runtime/src/main/cpp/Runtime.cpp index 6457527e4..8d831d9be 100644 --- a/test-app/runtime/src/main/cpp/Runtime.cpp +++ b/test-app/runtime/src/main/cpp/Runtime.cpp @@ -577,6 +577,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, const string& native else { m_isMainThread = false; auto postMessageFuncTemplate = FunctionTemplate::New(isolate, CallbackHandlers::WorkerGlobalPostMessageCallback); + globalTemplate->Set(ArgConverter::ConvertToV8String(isolate, "__ns__worker"), Boolean::New(isolate, true)); globalTemplate->Set(ArgConverter::ConvertToV8String(isolate, "postMessage"), postMessageFuncTemplate); auto closeFuncTemplate = FunctionTemplate::New(isolate, CallbackHandlers::WorkerGlobalCloseCallback); globalTemplate->Set(ArgConverter::ConvertToV8String(isolate, "close"), closeFuncTemplate); diff --git a/test-app/runtime/src/main/java/com/tns/Runtime.java b/test-app/runtime/src/main/java/com/tns/Runtime.java index ad8caed91..17670e3dc 100644 --- a/test-app/runtime/src/main/java/com/tns/Runtime.java +++ b/test-app/runtime/src/main/java/com/tns/Runtime.java @@ -605,6 +605,7 @@ public static void initWorker(String jsFileName, String callingJsDir, int id) { private static Runtime initRuntime(DynamicConfiguration dynamicConfiguration) { Runtime runtime = new Runtime(staticConfiguration, dynamicConfiguration); runtime.init(); + runtime.runScript(new File(staticConfiguration.appDir, "internal/ts_helpers.js")); return runtime; } From 556ed5a882f256443670e68e9de09aa2e68d13c6 Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Tue, 2 Jul 2024 17:17:23 -0300 Subject: [PATCH 2/6] ci: pin os version and switch to arm64 --- .github/workflows/npm_release.yml | 6 +++--- .github/workflows/pull_request.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index ffc4384f9..f7c7e5de7 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -10,13 +10,13 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: x86_64 + ANDROID_ABI: arm64 NDK_ARCH: darwin jobs: build: name: Build - runs-on: macos-latest + runs-on: macos-14 outputs: npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }} npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }} @@ -79,7 +79,7 @@ jobs: path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz test: name: Test - runs-on: macos-latest + runs-on: macos-14 needs: build steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c7056bcab..e5ad86b82 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,14 +6,14 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: x86_64 + ANDROID_ABI: arm64 NDK_ARCH: darwin jobs: build: name: Build - runs-on: macos-latest + runs-on: macos-14 outputs: npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }} npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }} @@ -76,7 +76,7 @@ jobs: path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz test: name: Test - runs-on: macos-latest + runs-on: macos-14 needs: build steps: - uses: actions/checkout@v3 From cc7df0e5d84c2a0b07a4918bcc901ed7f4c3cc1e Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Tue, 2 Jul 2024 17:42:42 -0300 Subject: [PATCH 3/6] ci: fix wrong android arch --- .github/workflows/npm_release.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index f7c7e5de7..800e4e5eb 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -10,7 +10,7 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: arm64 + ANDROID_ABI: arm64-v8a NDK_ARCH: darwin jobs: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e5ad86b82..5050e405e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,7 +6,7 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: arm64 + ANDROID_ABI: arm64-v8a NDK_ARCH: darwin From 109bdd99860127ff04afbbb060dd14a9b276c9c8 Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Tue, 2 Jul 2024 18:04:03 -0300 Subject: [PATCH 4/6] ci: pin to macos-13 since the emulator can't boot on M1 --- .github/workflows/npm_release.yml | 6 +++--- .github/workflows/pull_request.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index 800e4e5eb..1de240168 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -10,13 +10,13 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: arm64-v8a + ANDROID_ABI: x86_64 NDK_ARCH: darwin jobs: build: name: Build - runs-on: macos-14 + runs-on: macos-13 outputs: npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }} npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }} @@ -79,7 +79,7 @@ jobs: path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz test: name: Test - runs-on: macos-14 + runs-on: macos-13 needs: build steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5050e405e..d406bc1f4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,14 +6,14 @@ env: EMULATOR_NAME: "runtime-emu" NDK_VERSION: r23c ANDROID_API: 29 - ANDROID_ABI: arm64-v8a + ANDROID_ABI: x86_64 NDK_ARCH: darwin jobs: build: name: Build - runs-on: macos-14 + runs-on: macos-13 outputs: npm_version: ${{ steps.npm_version_output.outputs.NPM_VERSION }} npm_tag: ${{ steps.npm_version_output.outputs.NPM_TAG }} @@ -76,7 +76,7 @@ jobs: path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz test: name: Test - runs-on: macos-14 + runs-on: macos-13 needs: build steps: - uses: actions/checkout@v3 From d4b716427934ebb4387a04842561d5b5d0e1fa3d Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Tue, 2 Jul 2024 18:15:58 -0400 Subject: [PATCH 5/6] feat: Kotlin 2 + Gradle 8+ (#1812) --- build.sh | 45 +- package.json | 22 +- test-app/app/build.gradle | 540 ++++++++++++++---- test-app/app/src/main/AndroidManifest.xml | 6 +- test-app/build-tools/android-dts-generator | 2 +- .../android-metadata-generator/build.gradle | 74 ++- .../kotlin/classes/KotlinClassDescriptor.kt | 47 +- .../BytecodeExtensionFunctionsCollector.kt | 4 +- .../kotlin/metadata/ClassMetadataParser.kt | 6 +- .../bytecode/BytecodeClassMetadataParser.kt | 23 +- .../kotlin/methods/KotlinMethodDescriptor.kt | 23 +- .../static-binding-generator/build.gradle | 49 +- .../static-binding-generator/runtests.gradle | 14 +- test-app/build.gradle | 14 +- test-app/gradle.properties | 24 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- test-app/package.json | 4 +- .../runtime-binding-generator/build.gradle | 6 +- test-app/runtime/build.gradle | 135 ++++- test-app/runtime/src/main/cpp/URLImpl.cpp | 2 +- 20 files changed, 765 insertions(+), 277 deletions(-) diff --git a/build.sh b/build.sh index b176b1195..2f42b49c9 100755 --- a/build.sh +++ b/build.sh @@ -50,33 +50,34 @@ fi ./gradlew runSbgTests for emulator in $listOfEmulators; do - echo "Start emulator $emulator" - $ANDROID_HOME/emulator/emulator -avd ${emulator} -verbose -wipe-data -gpu on& - find ~/.android/avd/${emulator}.avd -type f -name 'config.ini' -exec cat {} + + echo "Start emulator $emulator" + $ANDROID_HOME/emulator/emulator -avd ${emulator} -verbose -wipe-data -gpu on& + find ~/.android/avd/${emulator}.avd -type f -name 'config.ini' -exec cat {} + - echo "Run Android Runtime unit tests for $emulator" - $ANDROID_HOME/platform-tools/adb wait-for-device - $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat -c - $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog.txt& - $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog$emulator.txt& + echo "Run Android Runtime unit tests for $emulator" + $ANDROID_HOME/platform-tools/adb wait-for-device + $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat -c + $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog.txt& + $ANDROID_HOME/platform-tools/adb -s emulator-5554 logcat > consoleLog$emulator.txt& - if [ "$1" != 'unit_tests_only' ]; then - ./gradlew runtests - else - ./gradlew runtests -PonlyX86 - fi + if [ "$1" != 'unit_tests_only' ]; then + ./gradlew runtests + else + ./gradlew runtests -PonlyX86 + fi - echo "Rename unit test result" - ( - cd ./test-app/dist - mv android_unit_test_results.xml $emulator.xml - ) + echo "Rename unit test result" + ( + cd ./test-app/dist + mv android_unit_test_results.xml $emulator.xml + ) - echo "Stopping running emulators" - for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done - for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done - for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done + echo "Stopping running emulators" + for KILLPID in `ps ax | grep 'emulator' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done + for KILLPID in `ps ax | grep 'qemu' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done + for KILLPID in `ps ax | grep 'adb' | grep -v 'grep' | awk ' { print $1;}'`; do kill -9 $KILLPID; done done echo $cwd cd $cwd + diff --git a/package.json b/package.json index 41958da2a..ee448f012 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nativescript/android", "description": "NativeScript for Android using v8", - "version": "8.7.0", + "version": "8.8.0-alpha.11", "repository": { "type": "git", "url": "https://github.com/NativeScript/android.git" @@ -10,20 +10,20 @@ "**/*" ], "version_info": { - "v8": "8.3.110.9", - "gradle": "7.6", - "gradleAndroid": "7.4.2", - "ndk": "r21", - "ndkApiLevel": "22", + "v8": "10.3.22.0", + "gradle": "8.4", + "gradleAndroid": "8.3.2", + "ndk": "r23c", + "ndkApiLevel": "17", "minSdk": "17", - "compileSdk": "32", - "buildTools": "32.0.0", - "kotlin": "1.7.10" + "compileSdk": "34", + "buildTools": "34.0.0", + "kotlin": "2.0.0" }, "// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "", "gradle": { - "version": "7.6", - "android": "7.4.2" + "version": "8.4", + "android": "8.3.2" }, "scripts": { "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index be0641b55..04162c55f 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -20,9 +20,8 @@ * -PappResourcesPath=[app_resources_path] */ - -import groovy.io.FileType import groovy.json.JsonSlurper +import groovy.xml.XmlSlurper import org.apache.commons.io.FileUtils import javax.inject.Inject @@ -30,26 +29,17 @@ import java.nio.file.Files import java.nio.file.Paths import java.nio.file.StandardCopyOption import java.security.MessageDigest - import java.util.jar.JarEntry import java.util.jar.JarFile import static org.gradle.internal.logging.text.StyledTextOutput.Style -import java.util.stream.Collectors; -import java.util.stream.Stream; - apply plugin: "com.android.application" apply from: "gradle-helpers/BuildToolTask.gradle" apply from: "gradle-helpers/CustomExecutionLogger.gradle" apply from: "gradle-helpers/AnalyticsCollector.gradle" - -def enableKotlin = (project.hasProperty("useKotlin") && project.useKotlin == "true") - -if (enableKotlin) { - apply plugin: 'kotlin-android' - apply plugin: 'kotlin-parcelize' -} +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-parcelize' def onlyX86 = project.hasProperty("onlyX86") if (onlyX86) { @@ -75,6 +65,7 @@ def SBG_BINDINGS_NAME = "sbg-bindings.txt" def SBG_INTERFACE_NAMES = "sbg-interface-names.txt" def INPUT_JS_DIR = "$projectDir/src/main/assets/app" def OUTPUT_JAVA_DIR = "$projectDir/src/main/java" +def APP_DIR = "$projectDir/src/main/assets/app" //metadata generator def MDG_OUTPUT_DIR = "mdg-output-dir.txt" @@ -86,9 +77,9 @@ def METADATA_JAVA_OUT = "mdg-java-out.txt" def pluginsJarLibraries = new LinkedList() def allJarLibraries = new LinkedList() -def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" } def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int } def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int } +def computeMinSdkVersion = { -> project.hasProperty("minSdk") ? minSdk : NS_DEFAULT_MIN_SDK_VERSION as int } def computeBuildToolsVersion = { -> project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String } @@ -98,7 +89,7 @@ def enableVerboseMDG = project.gradle.startParameter.logLevel.name() == 'DEBUG' def analyticsFilePath = "$rootDir/analytics/build-statistics.json" def analyticsCollector = project.ext.AnalyticsCollector.withOutputPath(analyticsFilePath) if (enableAnalytics) { - analyticsCollector.markUseKotlinPropertyInApp(enableKotlin) + analyticsCollector.markUseKotlinPropertyInApp(true) analyticsCollector.writeAnalyticsFile() } @@ -185,26 +176,49 @@ def setAppIdentifier = { -> if (appIdentifier) { project.ext.nsApplicationIdentifier = appIdentifier android.defaultConfig.applicationId = appIdentifier + android.namespace = appIdentifier + } + } +} + +def computeNamespace = { -> + def appPackageJsonFile = file("${APP_DIR}/$PACKAGE_JSON") + + if (appPackageJsonFile.exists()) { + def content = appPackageJsonFile.getText("UTF-8") + + def jsonSlurper = new JsonSlurper() + def packageJsonMap = jsonSlurper.parseText(content) + + def appIdentifier = "" + + if (packageJsonMap && packageJsonMap.id) { + appIdentifier = packageJsonMap.id + } + + + if (appIdentifier) { + return appIdentifier } } + return "com.tns.testapplication" } android { + namespace computeNamespace() applyBeforePluginGradleConfiguration() - if (enableKotlin) { - kotlinOptions { - jvmTarget = '1.8' - } + kotlinOptions { + jvmTarget = '17' } - compileSdkVersion computeCompileSdkVersion() - buildToolsVersion computeBuildToolsVersion() + compileSdk computeCompileSdkVersion() + buildToolsVersion = computeBuildToolsVersion() defaultConfig { def manifest = new XmlSlurper().parse(file(android.sourceSets.main.manifest.srcFile)) - def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: NS_DEFAULT_MIN_SDK_VERSION + def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: computeMinSdkVersion() minSdkVersion minSdkVer targetSdkVersion computeTargetSdkVersion() ndk { @@ -217,8 +231,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } sourceSets.main { @@ -252,12 +266,12 @@ android { applyAppGradleConfiguration() def initializeMergedAssetsOutputPath = { -> - android.applicationVariants.all { variant -> + android.applicationVariants.configureEach { variant -> if (variant.buildType.name == project.selectedBuildType) { def task if (variant.metaClass.respondsTo(variant, "getMergeAssetsProvider")) { def provider = variant.getMergeAssetsProvider() - task = provider.get(); + task = provider.get() } else { // fallback for older android gradle plugin versions task = variant.getMergeAssets() @@ -265,7 +279,7 @@ android { for (File file : task.getOutputs().getFiles()) { if (!file.getPath().contains("${File.separator}incremental${File.separator}")) { project.ext.mergedAssetsOutputPath = file.getPath() - break; + break } } } @@ -395,18 +409,13 @@ dependencies { implementation project(':runtime') } - def kotlinVersion = computeKotlinVersion() - if (enableKotlin) { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" - } - } //////////////////////////////////////////////////////////////////////////////////// ///////////////////////////// CONFIGURATION PHASE ////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// -task addDependenciesFromNativeScriptPlugins { +task 'addDependenciesFromNativeScriptPlugins' { nativescriptDependencies.each { dep -> def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.aar"]) aarFiles.each { aarFile -> @@ -427,7 +436,7 @@ task addDependenciesFromNativeScriptPlugins { } } -task addDependenciesFromAppResourcesLibraries { +task 'addDependenciesFromAppResourcesLibraries' { def appResourcesPath = getAppResourcesPath() def appResourcesLibraries = file("$appResourcesPath/Android/libs") if (appResourcesLibraries.exists()) { @@ -451,47 +460,20 @@ task addDependenciesFromAppResourcesLibraries { } if (failOnCompilationWarningsEnabled()) { - tasks.withType(JavaCompile) { + tasks.withType(JavaCompile).configureEach { options.compilerArgs << '-Xlint:all' << "-Werror" options.deprecation = true } } -tasks.whenTaskAdded({ DefaultTask currentTask -> - if (currentTask =~ /generate.+BuildConfig/) { - currentTask.finalizedBy(extractAllJars) - extractAllJars.finalizedBy(collectAllJars) - } - if (currentTask =~ /compile.+JavaWithJavac/) { - currentTask.dependsOn(runSbg) - currentTask.finalizedBy(buildMetadata) - } - - - if (currentTask =~ /compile.+Kotlin.+/) { - currentTask.dependsOn(runSbg) - currentTask.finalizedBy(buildMetadata) - } - - if (currentTask =~ /merge.*Assets/) { - currentTask.dependsOn(buildMetadata) - } - // ensure buildMetadata is done before R8 to allow custom proguard from metadata - if (currentTask =~ /minify.*WithR8/) { - currentTask.dependsOn(buildMetadata) - } - if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) { - currentTask.finalizedBy("validateAppIdMatch") - } -}) //////////////////////////////////////////////////////////////////////////////////// -///////////////////////////// EXECUTUION PHASE ///////////////////////////////////// +///////////////////////////// EXECUTION PHASE ///////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// task runSbg(type: BuildToolTask) { dependsOn "collectAllJars" - def rootPath = ""; + def rootPath = "" if (!findProject(':static-binding-generator').is(null)) { rootPath = Paths.get(project(':static-binding-generator').projectDir.path, "build/libs").toString() dependsOn ':static-binding-generator:jar' @@ -505,7 +487,7 @@ task runSbg(type: BuildToolTask) { mainClass = "-jar" def paramz = new ArrayList() - paramz.add(Paths.get(rootPath,"static-binding-generator.jar")) + paramz.add(Paths.get(rootPath, "static-binding-generator.jar")) if (failOnCompilationWarningsEnabled()) { paramz.add("-show-deprecation-warnings") @@ -551,7 +533,7 @@ def explodeAar(File compileDependency, File outputDir) { } } -def md5(String string) { +static def md5(String string) { MessageDigest digest = MessageDigest.getInstance("MD5") digest.update(string.bytes) return new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0') @@ -584,9 +566,9 @@ allprojects { def buildType = project.selectedBuildType def jars = [] def artifactType = Attribute.of('artifactType', String) - android.applicationVariants.all { variant -> + android.applicationVariants.configureEach { variant -> if (variant.buildType.name == buildType) { - variant.getCompileClasspath().each { fileDependency -> + variant.getCompileClasspath(null).each { fileDependency -> processJar(fileDependency, jars) } } @@ -604,7 +586,7 @@ def processJar(File jar, jars) { logger.debug("Creating dynamic task ${taskName}") // Add discovered jars as dependencies of cleanupAllJars. - // This is cruicial for cloud builds because they are different + // This is crucial for cloud builds because they are different // on each incremental build (as each time the gradle user home // directory is a randomly generated string) cleanupAllJars.inputs.files jar @@ -634,7 +616,7 @@ def processJar(File jar, jars) { } } -task cleanupAllJars { +task 'cleanupAllJars' { // We depend on the list of libs directories that might contain aar or jar files // and on the list of all discovered jars inputs.files(pluginDependencies) @@ -659,7 +641,7 @@ task cleanupAllJars { // Placeholder task which depends on all dynamically generated extraction tasks -task extractAllJars { +task 'extractAllJars' { dependsOn cleanupAllJars outputs.files extractAllJarsTimestamp @@ -668,7 +650,7 @@ task extractAllJars { } } -task collectAllJars { +task 'collectAllJars' { dependsOn extractAllJars description "gathers all paths to jar dependencies before building metadata with them" @@ -706,27 +688,31 @@ task collectAllJars { } } -task copyMetadataFilters(type: Copy) { - from "$rootDir/whitelist.mdg", "$rootDir/blacklist.mdg" - into "$BUILD_TOOLS_PATH" +task copyMetadataFilters { + outputs.files("$BUILD_TOOLS_PATH/whitelist.mdg", "$BUILD_TOOLS_PATH/blacklist.mdg") + // use an explicit copy task here because the copy task itselfs marks the whole built-tools as an output! + copy { + from file("$rootDir/whitelist.mdg"), file("$rootDir/blacklist.mdg") + into "$BUILD_TOOLS_PATH" + } } -task copyMetadata { +task 'copyMetadata' { doLast { copy { - from "$projectDir/src/main/assets/metadata" - into getMergedAssetsOutputPath() + "/metadata" + from "$projectDir/src/main/assets/metadata" + into getMergedAssetsOutputPath() + "/metadata" } } } def listf(String directoryName, ArrayList store) { - def directory = new File(directoryName); + def directory = new File(directoryName) - def resultList = new ArrayList(); + def resultList = new ArrayList() - def fList = directory.listFiles(); - resultList.addAll(Arrays.asList(fList)); + def fList = directory.listFiles() + resultList.addAll(Arrays.asList(fList)) for (File file : fList) { if (file.isFile()) { store.add(file) @@ -738,12 +724,173 @@ def listf(String directoryName, ArrayList store) { } task buildMetadata(type: BuildToolTask) { - def rootPath = ""; + def rootPath = "" if (!findProject(':android-metadata-generator').is(null)) { rootPath = Paths.get(project(':android-metadata-generator').projectDir.path, "build/libs").toString() dependsOn ':android-metadata-generator:jar' } + + + android.applicationVariants.all { variant -> + def buildTypeName = variant.buildType.name.capitalize() + def mergeShadersTaskName = "merge${buildTypeName}Shaders" + def mergeShadersTask = tasks.findByName(mergeShadersTaskName) + + if (mergeShadersTask) { + dependsOn mergeShadersTask + } + + def compileJavaWithJavacTaskName = "compile${buildTypeName}JavaWithJavac" + def compileJavaWithJavacTask = tasks.findByName(compileJavaWithJavacTaskName) + + + if (compileJavaWithJavacTask) { + dependsOn compileJavaWithJavacTask + } + + def compileKotlinTaskName = "compile${buildTypeName}Kotlin" + def compileKotlinTask = tasks.findByName(compileKotlinTaskName) + + + if (compileKotlinTask) { + dependsOn compileKotlinTask + } + + + def mergeDexTaskName = "mergeDex${buildTypeName}" + def mergeDexTask = tasks.findByName(mergeDexTaskName) + + if (mergeDexTask) { + dependsOn mergeDexTask + } + + def checkDuplicateClassesTaskName = "check${buildTypeName}DuplicateClasses" + def checkDuplicateClassesTask = tasks.findByName(checkDuplicateClassesTaskName) + + if (checkDuplicateClassesTask) { + dependsOn checkDuplicateClassesTask + } + + def generateBuildConfigTaskName = "generate${buildTypeName}BuildConfig" + def generateBuildConfigTask = tasks.findByName(generateBuildConfigTaskName) + + if (generateBuildConfigTask) { + dependsOn generateBuildConfigTask + } + + def dexBuilderTaskName = "dexBuilder${buildTypeName}" + def dexBuilderTask = tasks.findByName(dexBuilderTaskName) + + if (dexBuilderTask) { + dependsOn dexBuilderTask + } + + + def mergeExtDexTaskName = "mergeExtDex${buildTypeName}" + def mergeExtDexTask = tasks.findByName(mergeExtDexTaskName) + + if (mergeExtDexTask) { + dependsOn mergeExtDexTask + } + + def mergeLibDexTaskName = "mergeLibDex${buildTypeName}" + def mergeLibDexTask = tasks.findByName(mergeLibDexTaskName) + + if (mergeLibDexTask) { + dependsOn mergeLibDexTask + } + + def mergeProjectDexTaskName = "mergeProjectDex${buildTypeName}" + def mergeProjectDexTask = tasks.findByName(mergeProjectDexTaskName) + + if (mergeProjectDexTask) { + dependsOn mergeProjectDexTask + } + + def syncLibJarsTaskName = "sync${buildTypeName}LibJars" + def syncLibJarsTask = tasks.findByName(syncLibJarsTaskName) + + if (syncLibJarsTask) { + dependsOn syncLibJarsTask + } + + def mergeJavaResourceTaskName = "merge${buildTypeName}JavaResource" + def mergeJavaResourceTask = tasks.findByName(mergeJavaResourceTaskName) + + if (mergeJavaResourceTask) { + dependsOn mergeJavaResourceTask + } + + def mergeJniLibFoldersTaskName = "merge${buildTypeName}JniLibFolders" + def mergeJniLibFoldersTask = tasks.findByName(mergeJniLibFoldersTaskName) + + if (mergeJniLibFoldersTask) { + dependsOn mergeJniLibFoldersTask + } + + def mergeNativeLibsTaskName = "merge${buildTypeName}NativeLibs" + def mergeNativeLibsTask = tasks.findByName(mergeNativeLibsTaskName) + + if (mergeNativeLibsTask) { + dependsOn mergeNativeLibsTask + } + + def stripDebugSymbolsTaskName = "strip${buildTypeName}DebugSymbols" + def stripDebugSymbolsTask = tasks.findByName(stripDebugSymbolsTaskName) + + if (stripDebugSymbolsTask) { + dependsOn stripDebugSymbolsTask + } + + def validateSigningTaskName = "validateSigning${buildTypeName}" + def validateSigningTask = tasks.findByName(validateSigningTaskName) + + if (validateSigningTask) { + dependsOn validateSigningTask + } + + + def extractProguardFilesTaskName = "extractProguardFiles" + def extractProguardFilesTask = tasks.findByName(extractProguardFilesTaskName) + + if (extractProguardFilesTask) { + dependsOn extractProguardFilesTask + } + + + def compileArtProfileTaskName = "compile${buildTypeName}ArtProfile" + def compileArtProfileTask = tasks.findByName(compileArtProfileTaskName) + + if (compileArtProfileTask) { + dependsOn compileArtProfileTask + } + + + def extractNativeSymbolTablesTaskName = "extract${buildTypeName}NativeSymbolTables" + def extractNativeSymbolTablesTask = tasks.findByName(extractNativeSymbolTablesTaskName) + + if (extractNativeSymbolTablesTask) { + dependsOn extractNativeSymbolTablesTask + } + + + def optimizeResourcesTaskName = "optimize${buildTypeName}Resources" + def optimizeResourcesTask = tasks.findByName(optimizeResourcesTaskName) + + if (optimizeResourcesTask) { + dependsOn optimizeResourcesTask + } + + def bundleResourcesTaskName = "bundle${buildTypeName}Resources" + def bundleResourcesTask = tasks.findByName(bundleResourcesTaskName) + + if (bundleResourcesTask) { + dependsOn bundleResourcesTask + } + + } + dependsOn copyMetadataFilters // As some external gradle plugins can reorder the execution order of the tasks it may happen that buildMetadata is executed after merge{Debug/Release}Assets @@ -759,13 +906,17 @@ task buildMetadata(type: BuildToolTask) { inputs.files("$MDG_JAVA_DEPENDENCIES") // make MDG aware of whitelist.mdg and blacklist.mdg files - inputs.files(project.fileTree(dir: "$rootDir", include: "**/*.mdg")) + // inputs.files(project.fileTree(dir: "$rootDir", include: "**/*.mdg")) + // use explicit inputs as the above makes the whole build-tools directory an input! + inputs.files("$BUILD_TOOLS_PATH/whitelist.mdg", "$BUILD_TOOLS_PATH/blacklist.mdg") - def classesDir = "$buildDir/intermediates/javac" - inputs.dir(classesDir) + def classesDir = layout.buildDirectory.dir("intermediates/javac").get().asFile + if (classesDir.exists()) { + inputs.dir(classesDir) + } - def kotlinClassesDir = "$buildDir/tmp/kotlin-classes" - if (file(kotlinClassesDir).exists()) { + def kotlinClassesDir = layout.buildDirectory.dir("tmp/kotlin-classes").get().asFile + if (kotlinClassesDir.exists()) { inputs.dir(kotlinClassesDir) } @@ -785,8 +936,8 @@ task buildMetadata(type: BuildToolTask) { rootProject.subprojects { - def projectClassesDir = new File("$it.buildDir/intermediates/javac") - def projectKotlinClassesDir = new File("$it.buildDir/tmp/kotlin-classes") + def projectClassesDir = it.layout.buildDirectory.dir("intermediates/javac").get().asFile + def projectKotlinClassesDir = it.layout.buildDirectory.dir("tmp/kotlin-classes").get().asFile if (projectClassesDir.exists()) { def projectClassesSubDirs = projectClassesDir.listFiles() @@ -797,14 +948,14 @@ task buildMetadata(type: BuildToolTask) { } } - if (projectKotlinClassesDir.exists()) { - def projectKotlinClassesSubDirs = projectKotlinClassesDir.listFiles(); - for (File subDir : projectKotlinClassesSubDirs) { - if (!kotlinClassesSubDirs.contains(subDir)) { - kotlinClassesSubDirs.add(subDir) - } + if (projectKotlinClassesDir.exists()) { + def projectKotlinClassesSubDirs = projectKotlinClassesDir.listFiles() + for (File subDir : projectKotlinClassesSubDirs) { + if (!kotlinClassesSubDirs.contains(subDir)) { + kotlinClassesSubDirs.add(subDir) + } + } } - } } def generatedClasses = new LinkedList() @@ -821,7 +972,7 @@ task buildMetadata(type: BuildToolTask) { } def store = new ArrayList() - for (String dir: generatedClasses){ + for (String dir : generatedClasses) { listf(dir, store) } @@ -846,11 +997,11 @@ task buildMetadata(type: BuildToolTask) { def paramz = new ArrayList() paramz.add(Paths.get(rootPath, "android-metadata-generator.jar")) - if(enableAnalytics){ + if (enableAnalytics) { paramz.add("analyticsFilePath=$analyticsFilePath") } - if(enableVerboseMDG){ + if (enableVerboseMDG) { paramz.add("verbose") } @@ -912,7 +1063,7 @@ static def shouldIncludeDirForTypings(path, includeDirs) { return false } -task copyTypings { +task 'copyTypings' { doLast { outLogger.withStyle(Style.Info).println "Copied generated typings to application root level. Make sure to import android.d.ts in reference.d.ts" @@ -926,12 +1077,12 @@ task copyTypings { copyTypings.onlyIf { generateTypescriptDefinitions.didWork } generateTypescriptDefinitions.finalizedBy(copyTypings) -task validateAppIdMatch { +task 'validateAppIdMatch' { doLast { def lineSeparator = System.getProperty("line.separator") if (project.hasProperty("nsApplicationIdentifier") && !project.hasProperty("release")) { - if (project.nsApplicationIdentifier != android.defaultConfig.applicationId) { + if (project.nsApplicationIdentifier != android.defaultConfig.applicationId && android.namespace != appIdentifier) { def errorMessage = "${lineSeparator}WARNING: The Application identifier is different from the one inside \"package.json\" file.$lineSeparator" + "NativeScript CLI might not work properly.$lineSeparator" + "Remove applicationId from app.gradle and update the \"nativescript.id\" in package.json.$lineSeparator" + @@ -970,3 +1121,186 @@ task cleanMdg(type: Delete) { cleanSbg.dependsOn(cleanMdg) clean.dependsOn(cleanSbg) + + +//dependsOn { +// pattern { +// include "merge*.Shaders" // Matches tasks starting with "merge" and ending with "Shaders" +// } +//} + + +tasks.configureEach({ DefaultTask currentTask -> + // println "\t ~ [DEBUG][app] build.gradle - currentTask = ${currentTask.name} ..." + + if (currentTask =~ /compile.+JavaWithJavac/) { + currentTask.dependsOn(runSbg) + } + + if (currentTask =~ /mergeDex.+/) { + currentTask.dependsOn(runSbg) + } + + if (currentTask =~ /compile.+Kotlin.+/) { + currentTask.dependsOn(runSbg) + } + + if (currentTask =~ /merge.*Assets/) { + currentTask.dependsOn(buildMetadata) + } + +// // ensure buildMetadata is done before R8 to allow custom proguard from metadata + if (currentTask =~ /minify.*WithR8/) { + buildMetadata.finalizedBy(currentTask) + } + if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) { + currentTask.finalizedBy("validateAppIdMatch") + } + + if (currentTask =~ /process.+Resources/) { + cleanupAllJars.dependsOn(currentTask) + } + +// if (currentTask.name == "extractProguardFiles") { +// currentTask.finalizedBy(buildMetadata) +// } +// + if (currentTask =~ /generate.+LintVitalReportModel/) { + currentTask.dependsOn(buildMetadata) + } + + if (currentTask =~ /lintVitalAnalyze.+/) { + currentTask.dependsOn(buildMetadata) + } +// +// if (currentTask =~ /merge.+GlobalSynthetics/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /optimize.+Resources/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /buildCMake.*/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /configureCMake.*/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /validateSigning.*/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /generate.*LintReportModel/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /generate.*AndroidTestResValues/) { +// // buildMetadata.dependsOn(currentTask) +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /generate.*AndroidTestLintModel/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /generate.*UnitTestLintModel/) { +// buildMetadata.mustRunAfter(currentTask) +// } +// +// if (currentTask =~ /generate.*UnitTestLintModel/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// +// if (currentTask =~ /lintAnalyze.*UnitTest/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /process.*JavaRes/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /strip.*DebugSymbols/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /merge.*JavaResource/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /lintAnalyze.*/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /lintAnalyze.*AndroidTest/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /bundle.*Resources/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /compile.*ArtProfile/) { +// currentTask.mustRunAfter(buildMetadata) +// } +// +// if (currentTask =~ /check.*DuplicateClasses/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /check.*AarMetadata/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /create.*CompatibleScreenManifests/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /process.*Manifest/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /generate.*ResValues/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /merge.*Resources/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /package.*Resources/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /process.*Resources/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /desugar.*Dependencies/) { +// currentTask.finalizedBy(buildMetadata) +// } +// +// if (currentTask =~ /merge.*JniLibFolders/) { +// currentTask.finalizedBy(buildMetadata) +// } + +}) + +rootProject.subprojects.forEach { + it.tasks.configureEach({ DefaultTask currentTask -> + if (currentTask =~ /.+bundleLibCompileToJar.*/) { + currentTask.finalizedBy(cleanupAllJars) + } + + if (currentTask =~ /bundleLibRuntimeToDir.*/) { + currentTask.finalizedBy(buildMetadata) + } + + if (currentTask =~ /compile.*LibraryResources/) { + currentTask.finalizedBy(buildMetadata) + } + }) +} diff --git a/test-app/app/src/main/AndroidManifest.xml b/test-app/app/src/main/AndroidManifest.xml index dee1642b6..b0a7d50b3 100644 --- a/test-app/app/src/main/AndroidManifest.xml +++ b/test-app/app/src/main/AndroidManifest.xml @@ -1,10 +1,10 @@ - + - + = emptyList() if (meta is KotlinClassMetadata.Class) { - val metaClass = meta.toKmClass() + val metaClass = meta.kmClass kotlinMetadataProperties = metaClass.properties val possibleCompanionField = getCompanionFieldIfAny(nativeClass, metaClass) @@ -68,9 +69,9 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati } } else if (meta is KotlinClassMetadata.FileFacade) { - kotlinMetadataProperties = meta.toKmPackage().properties + kotlinMetadataProperties = meta.kmPackage.properties } else if (meta is KotlinClassMetadata.MultiFileClassPart) { - kotlinMetadataProperties = meta.toKmPackage().properties + kotlinMetadataProperties = meta.kmPackage.properties } @@ -95,11 +96,11 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati if (field.name == prop.name) { val kotlinField = KotlinJvmFieldDescriptor( field = field, - isPublic = Flag.IS_PUBLIC(prop.flags), - isInternal = Flag.IS_INTERNAL(prop.flags), - isProtected = Flag.IS_PROTECTED(prop.flags), + isPublic = prop.visibility == Visibility.PUBLIC, + isInternal = prop.visibility == Visibility.INTERNAL, + isProtected = prop.visibility == Visibility.PROTECTED, isPackagePrivate, - isPrivate = Flag.IS_PRIVATE(prop.flags), + isPrivate = prop.visibility == Visibility.PRIVATE, ) kotlinFields.add(kotlinField) @@ -191,13 +192,17 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati var getter: NativeMethodDescriptor? = null val getterSignature = it.getterSignature if (getterSignature != null) { - getter = getMethodDescriptorWithSignature(getterSignature.name, getterSignature.desc) + getter = getMethodDescriptorWithSignature(getterSignature.name, + getterSignature.descriptor + ) } var setter: NativeMethodDescriptor? = null val setterSignature = it.setterSignature if (setterSignature != null) { - setter = getMethodDescriptorWithSignature(setterSignature.name, setterSignature.desc) + setter = getMethodDescriptorWithSignature(setterSignature.name, + setterSignature.descriptor + ) } KotlinPropertyDescriptor(propertyName, getter, setter, duplicate) @@ -225,28 +230,28 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati override val isPublic by lazy { when (val metadata = kotlinMetadata) { - is KotlinClassMetadata.Class -> Flag.IS_PUBLIC(metadata.toKmClass().flags) + is KotlinClassMetadata.Class -> metadata.kmClass.visibility == Visibility.PUBLIC else -> clazz.isPublic } } override val isInternal by lazy { when (val metadata = kotlinMetadata) { - is KotlinClassMetadata.Class -> Flag.IS_INTERNAL(metadata.toKmClass().flags) + is KotlinClassMetadata.Class -> metadata.kmClass.visibility == Visibility.INTERNAL else -> false } } override val isProtected by lazy { when (val metadata = kotlinMetadata) { - is KotlinClassMetadata.Class -> Flag.IS_PROTECTED(metadata.toKmClass().flags) + is KotlinClassMetadata.Class -> metadata.kmClass.visibility == Visibility.PROTECTED else -> clazz.isProtected } } override val isPrivate by lazy { when (val metadata = kotlinMetadata) { - is KotlinClassMetadata.Class -> Flag.IS_PRIVATE(metadata.toKmClass().flags) + is KotlinClassMetadata.Class -> metadata.kmClass.visibility == Visibility.PRIVATE else -> clazz.isPrivate } } @@ -262,7 +267,7 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati metadataAnnotation.packageName, metadataAnnotation.extraInt) - KotlinClassMetadata.read(metadata) + KotlinClassMetadata.readStrict(metadata) } diff --git a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/extensions/bytecode/BytecodeExtensionFunctionsCollector.kt b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/extensions/bytecode/BytecodeExtensionFunctionsCollector.kt index cf3e985ed..86a2fb91d 100644 --- a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/extensions/bytecode/BytecodeExtensionFunctionsCollector.kt +++ b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/extensions/bytecode/BytecodeExtensionFunctionsCollector.kt @@ -7,7 +7,7 @@ import com.telerik.metadata.parsing.kotlin.extensions.KotlinExtensionFunctionDes import com.telerik.metadata.parsing.kotlin.extensions.ExtensionFunctionsCollector import com.telerik.metadata.parsing.kotlin.metadata.ClassMetadataParser import com.telerik.metadata.parsing.kotlin.methods.KotlinMethodDescriptor -import kotlinx.metadata.jvm.signature +import kotlin.metadata.jvm.signature import java.util.* class BytecodeExtensionFunctionsCollector(private val kotlinClassMetadataParser: ClassMetadataParser) : ExtensionFunctionsCollector { @@ -24,7 +24,7 @@ class BytecodeExtensionFunctionsCollector(private val kotlinClassMetadataParser: if (signature != null) { val functionName = signature.name - val functionSignature = signature.desc + val functionSignature = signature.descriptor val extensionFunctionDescriptor: KotlinMethodDescriptor = Arrays .stream(kotlinClassDescriptor.methods) diff --git a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/ClassMetadataParser.kt b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/ClassMetadataParser.kt index 732a3f63c..e99bb32b3 100644 --- a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/ClassMetadataParser.kt +++ b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/ClassMetadataParser.kt @@ -2,9 +2,9 @@ package com.telerik.metadata.parsing.kotlin.metadata import com.telerik.metadata.parsing.NativeClassDescriptor -import kotlinx.metadata.KmFunction -import kotlinx.metadata.KmProperty -import kotlinx.metadata.jvm.KotlinClassMetadata +import kotlin.metadata.KmFunction +import kotlin.metadata.KmProperty +import kotlin.metadata.jvm.KotlinClassMetadata import java.util.stream.Stream interface ClassMetadataParser { diff --git a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/bytecode/BytecodeClassMetadataParser.kt b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/bytecode/BytecodeClassMetadataParser.kt index 28b2a2110..53f81b69c 100644 --- a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/bytecode/BytecodeClassMetadataParser.kt +++ b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/metadata/bytecode/BytecodeClassMetadataParser.kt @@ -3,10 +3,11 @@ package com.telerik.metadata.parsing.kotlin.metadata.bytecode import com.telerik.metadata.parsing.NativeClassDescriptor import com.telerik.metadata.parsing.kotlin.classes.KotlinClassDescriptor import com.telerik.metadata.parsing.kotlin.metadata.ClassMetadataParser -import kotlinx.metadata.Flag -import kotlinx.metadata.KmFunction -import kotlinx.metadata.KmProperty -import kotlinx.metadata.jvm.KotlinClassMetadata +import kotlin.metadata.KmFunction +import kotlin.metadata.KmProperty +import kotlin.metadata.Visibility +import kotlin.metadata.jvm.KotlinClassMetadata +import kotlin.metadata.visibility import java.lang.reflect.Modifier import java.util.stream.Stream @@ -19,7 +20,7 @@ class BytecodeClassMetadataParser : ClassMetadataParser { val kotlinMetadata = clazz.kotlinMetadata if (kotlinMetadata is KotlinClassMetadata.Class) { - val kmClass = kotlinMetadata.toKmClass() + val kmClass = kotlinMetadata.kmClass kmClass.companionObject val companion = kmClass.companionObject val fullCompanionName = clazz.className + "$" + companion @@ -31,15 +32,15 @@ class BytecodeClassMetadataParser : ClassMetadataParser { override fun getKotlinProperties(kotlinMetadata: KotlinClassMetadata): Stream { if (kotlinMetadata is KotlinClassMetadata.Class) { - val kmClass = kotlinMetadata.toKmClass() + val kmClass = kotlinMetadata.kmClass return kmClass.properties .stream() .filter { - Flag.IS_PUBLIC(it.flags) || Flag.IS_PROTECTED(it.flags) + it.visibility == Visibility.PUBLIC || it.visibility == Visibility.PROTECTED } .filter { p -> - ((Modifier.isPublic(p.getterFlags) || Modifier.isProtected(p.getterFlags)) - && (Modifier.isPublic(p.setterFlags) || Modifier.isProtected(p.setterFlags)) + ((p.getter.visibility == Visibility.PUBLIC || p.getter.visibility == Visibility.PROTECTED) + && (p.setter?.visibility == Visibility.PUBLIC || p.setter?.visibility == Visibility.PROTECTED) && !p.name.startsWith("is")) } } @@ -49,13 +50,13 @@ class BytecodeClassMetadataParser : ClassMetadataParser { override fun getKotlinExtensionFunctions(kotlinMetadata: KotlinClassMetadata): Stream { if (kotlinMetadata is KotlinClassMetadata.Class) { - val kmClass = kotlinMetadata.toKmClass() + val kmClass = kotlinMetadata.kmClass return kmClass.functions .stream() .filter { isVisibleExtensionFunction(it) } } else if (kotlinMetadata is KotlinClassMetadata.FileFacade) { - val kmClass = kotlinMetadata.toKmPackage() + val kmClass = kotlinMetadata.kmPackage return kmClass.functions .stream() diff --git a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/methods/KotlinMethodDescriptor.kt b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/methods/KotlinMethodDescriptor.kt index 89fc10cca..9ec1a640c 100644 --- a/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/methods/KotlinMethodDescriptor.kt +++ b/test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/methods/KotlinMethodDescriptor.kt @@ -2,10 +2,11 @@ package com.telerik.metadata.parsing.kotlin.methods import com.telerik.metadata.parsing.bytecode.methods.NativeMethodBytecodeDescriptor import com.telerik.metadata.parsing.kotlin.classes.KotlinClassDescriptor -import kotlinx.metadata.Flag -import kotlinx.metadata.KmDeclarationContainer -import kotlinx.metadata.jvm.KotlinClassMetadata -import kotlinx.metadata.jvm.signature +import kotlin.metadata.KmDeclarationContainer +import kotlin.metadata.Visibility +import kotlin.metadata.jvm.KotlinClassMetadata +import kotlin.metadata.jvm.signature +import kotlin.metadata.visibility import org.apache.bcel.classfile.Method class KotlinMethodDescriptor(private val method: Method, private val originClass: KotlinClassDescriptor, @@ -26,11 +27,15 @@ class KotlinMethodDescriptor(private val method: Method, private val originClass override val isInternal by lazy { return@lazy when (val kotlinMetadata = originClass.kotlinMetadata) { - is KotlinClassMetadata.Class -> checkIfMethodIsInternal(method, kotlinMetadata.toKmClass()) - is KotlinClassMetadata.FileFacade -> checkIfMethodIsInternal(method, kotlinMetadata.toKmPackage()) + is KotlinClassMetadata.Class -> checkIfMethodIsInternal(method, kotlinMetadata.kmClass) + is KotlinClassMetadata.FileFacade -> checkIfMethodIsInternal(method, + kotlinMetadata.kmPackage + ) is KotlinClassMetadata.SyntheticClass -> false is KotlinClassMetadata.MultiFileClassFacade -> false - is KotlinClassMetadata.MultiFileClassPart -> checkIfMethodIsInternal(method, kotlinMetadata.toKmPackage()) + is KotlinClassMetadata.MultiFileClassPart -> checkIfMethodIsInternal(method, + kotlinMetadata.kmPackage + ) is KotlinClassMetadata.Unknown -> false null -> false } @@ -40,8 +45,8 @@ class KotlinMethodDescriptor(private val method: Method, private val originClass val function = kotlinDeclarationContainer .functions .firstOrNull { - it.signature != null && it.signature!!.name == method.name && it.signature!!.desc == method.signature + it.signature != null && it.signature!!.name == method.name && it.signature!!.descriptor == method.signature } - return if (function != null) Flag.IS_INTERNAL(function.flags) else false + return if (function != null) function.visibility == Visibility.INTERNAL else false } } \ No newline at end of file diff --git a/test-app/build-tools/static-binding-generator/build.gradle b/test-app/build-tools/static-binding-generator/build.gradle index 0fe6445ae..42fd71f04 100644 --- a/test-app/build-tools/static-binding-generator/build.gradle +++ b/test-app/build-tools/static-binding-generator/build.gradle @@ -1,8 +1,5 @@ apply plugin: 'java-library' -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - // todo: check if still needed // if(!project.hasProperty("loadedProjectDeps")){ // Properties projectDeps = new Properties() @@ -34,32 +31,62 @@ dependencies { compileJava { options.compilerArgs << "-Xlint:all" << "-Xlint:-options" << "-Werror" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } -jar { +configurations.create("staticBindingGeneratorTestImplementation") { + extendsFrom configurations.testImplementation + setCanBeResolved(true) +} + +configurations.create("staticBindingGeneratorImplementation") { + extendsFrom configurations.implementation + setCanBeResolved(true) +} + +configurations.create("staticBindingGeneratorRuntimeOnly") { + extendsFrom configurations.runtimeOnly + setCanBeResolved(true) +} + +configurations.create("staticBindingGeneratorApi") { + extendsFrom configurations.api + setCanBeResolved(true) +} - configurations.implementation.setCanBeResolved(true) - configurations.runtimeOnly.setCanBeResolved(true) - configurations.api.setCanBeResolved(true) +jar { manifest { - attributes("Manifest-Version": "1.0", + attributes("Manifest-Version": "2.0", "Main-Class": "org.nativescript.staticbindinggenerator.Main") } from { - configurations.implementation.collect { + configurations.staticBindingGeneratorTestImplementation.collect { + it.isDirectory() ? it : zipTree(it) + } + + configurations.staticBindingGeneratorImplementation.collect { it.isDirectory() ? it : zipTree(it) } - configurations.runtimeOnly.collect { + configurations.staticBindingGeneratorRuntimeOnly.collect { it.isDirectory() ? it : zipTree(it) } - configurations.api.collect { + configurations.staticBindingGeneratorApi.collect { it.isDirectory() ? it : zipTree(it) } } duplicatesStrategy = 'include' } + +def copyMetadataFilters = tasks.findByPath(":app:copyMetadataFilters") +if (copyMetadataFilters != null) { + compileJava.dependsOn(copyMetadataFilters) + if (processTestResources) { + processTestResources.dependsOn(copyMetadataFilters) + } +} diff --git a/test-app/build-tools/static-binding-generator/runtests.gradle b/test-app/build-tools/static-binding-generator/runtests.gradle index cd7e770a8..321ae9f68 100644 --- a/test-app/build-tools/static-binding-generator/runtests.gradle +++ b/test-app/build-tools/static-binding-generator/runtests.gradle @@ -44,14 +44,20 @@ def outputFile = file('../sbg-output-file.txt') def javaDependenciesFile = file('../sbg-java-dependencies.txt') def interfaceNamesFile = file('../sbg-interface-names.txt') + +configurations.create("runTestsApi") { + extendsFrom configurations.api + setCanBeResolved(true) +} + + jar { - configurations.api.setCanBeResolved(true) manifest { attributes("Manifest-Version": "1.0", "Main-Class": "org.nativescript.staticbindinggenerator.Main") } from { - configurations.api.collect { + configurations.runTestsApi.collect { it.isDirectory() ? it : zipTree(it) } } @@ -73,6 +79,6 @@ task runSbg(type: JavaExec, dependsOn: 'prepareInputFiles') { main = "org.nativescript.staticbindinggenerator.Main" } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } \ No newline at end of file diff --git a/test-app/build.gradle b/test-app/build.gradle index 55ca4c66d..99a1643b2 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -38,9 +38,9 @@ version of the {N} CLI install a previous version of the runtime package - 'tns """) } - project.ext.extractedDependenciesDir = "${project.buildDir}/exploded-dependencies" - project.ext.cleanupAllJarsTimestamp = "${project.buildDir}/cleanupAllJars.timestamp" - project.ext.extractAllJarsTimestamp = "${project.buildDir}/extractAllJars.timestamp" + project.ext.extractedDependenciesDir = "${project.layout.buildDirectory.dir("exploded-dependencies").get().asFile}" + project.ext.cleanupAllJarsTimestamp = "${project.layout.buildDirectory.file("cleanupAllJars.timestamp").get().asFile}" + project.ext.extractAllJarsTimestamp = "${project.layout.buildDirectory.file("extractAllJars.timestamp").get().asFile}" project.ext.nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text) @@ -144,7 +144,7 @@ version of the {N} CLI install a previous version of the runtime package - 'tns dependencies { classpath "com.android.tools.build:gradle:$androidBuildToolsVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "org.codehaus.groovy:groovy-all:3.0.8" + classpath "org.apache.groovy:groovy-all:4.0.21" } } @@ -165,6 +165,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir -} +task clean (type:Delete) { + delete rootProject.layout.buildDirectory.get().asFile +} \ No newline at end of file diff --git a/test-app/gradle.properties b/test-app/gradle.properties index d78e7d3ca..3e0dd8320 100644 --- a/test-app/gradle.properties +++ b/test-app/gradle.properties @@ -19,27 +19,27 @@ android.enableJetifier=true android.useAndroidX=true # Default versions used throughout the gradle configurations -NS_DEFAULT_BUILD_TOOLS_VERSION=33.0.0 -NS_DEFAULT_COMPILE_SDK_VERSION=33 +NS_DEFAULT_BUILD_TOOLS_VERSION=34.0.0 +NS_DEFAULT_COMPILE_SDK_VERSION=34 NS_DEFAULT_MIN_SDK_VERSION=17 -NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=7.4.2 +NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.3.2 ns_default_androidx_appcompat_version = 1.5.1 -ns_default_androidx_exifinterface_version = 1.3.3 -ns_default_androidx_fragment_version = 1.5.3 -ns_default_androidx_material_version = 1.6.1 +ns_default_androidx_exifinterface_version = 1.3.7 +ns_default_androidx_fragment_version = 1.5.7 +ns_default_androidx_material_version = 1.8.0 ns_default_androidx_multidex_version = 2.0.1 ns_default_androidx_transition_version = 1.4.1 ns_default_androidx_viewpager_version = 1.0.0 -ns_default_asm_util_version = 7.0 -ns_default_asm_version = 7.0 -ns_default_bcel_version = 6.5.0 +ns_default_asm_util_version = 9.7 +ns_default_asm_version = 9.7 +ns_default_bcel_version = 6.8.2 ns_default_commons_io_version = 2.6 ns_default_google_java_format_version = 1.6 -ns_default_gson_version = 2.9.0 +ns_default_gson_version = 2.10.1 ns_default_json_version = 20180813 ns_default_junit_version = 4.13.2 -ns_default_kotlin_version = 1.7.10 -ns_default_kotlinx_metadata_jvm_version = 0.6.2 +ns_default_kotlin_version = 2.0.0 +ns_default_kotlinx_metadata_jvm_version = 2.0.0 ns_default_mockito_core_version = 3.0.0 ns_default_spotbugs_version = 3.1.12 diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties index 070cb702f..e411586a5 100644 --- a/test-app/gradle/wrapper/gradle-wrapper.properties +++ b/test-app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test-app/package.json b/test-app/package.json index 7ec7b1851..ada9f8e81 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -4,8 +4,8 @@ "version": "1.0.0", "private": true, "dependencies": { - "@nativescript/core": "~8.4.0", - "nativescript": "~8.4.0" + "@nativescript/core": "~8.7.0", + "nativescript": "~8.7.0" }, "devDependencies": {} } diff --git a/test-app/runtime-binding-generator/build.gradle b/test-app/runtime-binding-generator/build.gradle index c158377b4..d98d8376b 100644 --- a/test-app/runtime-binding-generator/build.gradle +++ b/test-app/runtime-binding-generator/build.gradle @@ -6,8 +6,10 @@ dependencies { testImplementation "junit:junit:${ns_default_junit_version}" } -sourceCompatibility = JavaVersion.VERSION_1_7 -targetCompatibility = JavaVersion.VERSION_1_7 +java { + sourceCompatibility = '17' + targetCompatibility = '17' +} // Disable compilation tasks as these are compiled *with* the runtime and not separately compileJava.enabled = false diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle index 9f48c58ff..b1b974de9 100644 --- a/test-app/runtime/build.gradle +++ b/test-app/runtime/build.gradle @@ -31,16 +31,16 @@ if (hasNdkVersion) { def NDK_PATH = "" def hasNdkDirectory = project.hasProperty("ndkDirectory") -if(!hasNdkDirectory){ +if (!hasNdkDirectory) { println "No ndkDirectory set, checking environment \$ANDROID_NDK..." - + NDK_PATH = "$System.env.ANDROID_NDK" - if (NDK_PATH == null || NDK_PATH == "null"){ + if (NDK_PATH == null || NDK_PATH == "null") { println "No ndkDirectory set, checking environment \$ANDROID_NDK_ROOT..." NDK_PATH = "$System.env.ANDROID_NDK_ROOT" } - - if (NDK_PATH == null || NDK_PATH == "null"){ + + if (NDK_PATH == null || NDK_PATH == "null") { println "No ndkDirectory set, checking environment \$ANDROID_NDK_HOME..." NDK_PATH = "$System.env.ANDROID_NDK_HOME" } @@ -48,8 +48,8 @@ if(!hasNdkDirectory){ NDK_PATH = ndkDirectory } -if(NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") { - if(!hasNdkVersion){ +if (NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") { + if (!hasNdkVersion) { NDK_PATH = "$System.env.ANDROID_HOME/ndk/${defaultNdkVersion}" } else { NDK_PATH = "$System.env.ANDROID_HOME/ndk/${ndkVersion}" @@ -58,11 +58,23 @@ if(NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") { println "Runtime using NDK_PATH: " + NDK_PATH +base { + if (!optimized && !optimizedWithInspector) { + archivesName = "${base.archivesName.get()}-regular" + } else { + if (optimized) { + archivesName = "${base.archivesName.get()}-optimized" + } else if (optimizedWithInspector) { + archivesName = "${base.archivesName.get()}-optimized-with-inspector" + } + } +} + android { namespace "com.tns.android_runtime" - compileSdkVersion NS_DEFAULT_COMPILE_SDK_VERSION as int - buildToolsVersion NS_DEFAULT_BUILD_TOOLS_VERSION as String + compileSdk NS_DEFAULT_COMPILE_SDK_VERSION as int + buildToolsVersion = NS_DEFAULT_BUILD_TOOLS_VERSION as String sourceSets { main { @@ -84,16 +96,6 @@ android { minSdkVersion NS_DEFAULT_MIN_SDK_VERSION as int targetSdkVersion NS_DEFAULT_COMPILE_SDK_VERSION as int - if (!optimized && !optimizedWithInspector) { - project.archivesBaseName = "${archivesBaseName}-regular" - } else { - if (optimized) { - project.archivesBaseName = "${archivesBaseName}-optimized" - } else if (optimizedWithInspector) { - project.archivesBaseName = "${archivesBaseName}-optimized-with-inspector" - } - } - externalNativeBuild { cmake { @@ -118,11 +120,11 @@ android { ndk { minSdkVersion NS_DEFAULT_MIN_SDK_VERSION as int - if (onlyX86) { - abiFilters 'x86' - } else { - abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' - } + if (onlyX86) { + abiFilters 'x86' + } else { + abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a' + } } } @@ -143,8 +145,10 @@ android { allprojects { gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:all" << "-Werror" + tasks.withType(JavaCompile).tap { + configureEach { + options.compilerArgs << "-Xlint:all" << "-Werror" + } } } } @@ -157,15 +161,16 @@ dependencies { testImplementation "org.mockito:mockito-core:${ns_default_mockito_core_version}" } -tasks.whenTaskAdded { task -> + +tasks.configureEach { task -> def taskName = task.getName() - // println "\t ~ [DEBUG][runtime] build.gradle whenTaskAdded taskName = ${taskName}" + // println "\t ~ [DEBUG][runtime] build.gradle whenTaskAdded taskName = ${taskName}" if (taskName.contains("preReleaseBuild")) { setRuntimeCommit.dependsOn(setPackageVersion) task.dependsOn(setRuntimeCommit) } - if(taskName.contains("bundleReleaseAar")){ + if (taskName.contains("bundleReleaseAar")) { task.dependsOn("testDebugUnitTest") } @@ -175,9 +180,77 @@ tasks.whenTaskAdded { task -> if ((taskName == "bundleDebug") || (taskName == "bundleRelease")) { task.finalizedBy createPackageConfigFileTask(taskName) } + + if (task =~ /configureCMake.*/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /buildCMake.*/) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("syncReleaseLibJars") || taskName.contains("syncDebugLibJars")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("mergeReleaseJniLibFolders") || taskName.contains("mergeDebugJniLibFolders")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("mergeReleaseShaders") || taskName.contains("mergeDebugShaders")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("packageReleaseAssets") || taskName.contains("packageDebugAssets")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("copyReleaseJniLibsProjectOnly") || taskName.contains("copyDebugJniLibsProjectOnly")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("copyReleaseJniLibsProjectAndLocalJars") || taskName.contains("copyDebugJniLibsProjectAndLocalJars")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("generateReleaseLintVitalModel") || taskName.contains("generateDebugLintVitalModel")) { + task.finalizedBy(":app:buildMetadata") + } + + if (taskName.contains("lintVitalAnalyzeRelease") || taskName.contains("lintVitalAnalyzeDebug")) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /lintAnalyze.+AndroidTest/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /compile.+UnitTestJavaWithJavac/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /generate.+LintModel/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /process.+Manifest/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /merge.+Resources/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /verify.+Resources/) { + task.finalizedBy(":app:buildMetadata") + } + + if (task =~ /test.+UnitTest/) { + task.finalizedBy(":app:buildMetadata") + } } -task setPackageVersion { +task 'setPackageVersion' { onlyIf { project.hasProperty('packageVersion') } @@ -192,7 +265,7 @@ task setPackageVersion { } } -task setRuntimeCommit { +task 'setRuntimeCommit' { onlyIf { project.hasProperty('gitCommitVersion') } diff --git a/test-app/runtime/src/main/cpp/URLImpl.cpp b/test-app/runtime/src/main/cpp/URLImpl.cpp index a2dccc7fb..e876132f4 100644 --- a/test-app/runtime/src/main/cpp/URLImpl.cpp +++ b/test-app/runtime/src/main/cpp/URLImpl.cpp @@ -261,7 +261,7 @@ void URLImpl::GetHref(v8::Local property, } auto isolate = info.GetIsolate(); - auto value = ptr->GetURL()->get_hostname(); + auto value = ptr->GetURL()->get_href(); info.GetReturnValue().Set( ArgConverter::ConvertToV8String(isolate, value.data(), value.length())); From ea97178ad10f5645b1783cd218b53a4dbb88400a Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Tue, 9 Jul 2024 12:08:58 -0700 Subject: [PATCH 6/6] release: 8.8.0 --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 910f1071a..6a6893ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# [8.8.0](https://github.com/NativeScript/android/compare/v8.7.0...v8.8.0) (2024-07-09) + + +### Bug Fixes + +* correctly load ts_helpers.js in workers ([#1798](https://github.com/NativeScript/android/issues/1798)) ([31f8501](https://github.com/NativeScript/android/commit/31f8501bb902815cfed8e1cd123fe8b6de2cb757)) + + +### Features + +* Kotlin 2 + Gradle 8+ ([#1812](https://github.com/NativeScript/android/issues/1812)) ([d4b7164](https://github.com/NativeScript/android/commit/d4b716427934ebb4387a04842561d5b5d0e1fa3d)) + + + # [8.7.0](https://github.com/NativeScript/android/compare/v8.7.0-rc.3...v8.7.0) (2024-04-08) diff --git a/package.json b/package.json index ee448f012..6f3ba0d75 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nativescript/android", "description": "NativeScript for Android using v8", - "version": "8.8.0-alpha.11", + "version": "8.8.0", "repository": { "type": "git", "url": "https://github.com/NativeScript/android.git"