@nativescript/android 8.8.0-alpha.0 → 8.8.0-alpha.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/framework/app/build.gradle +347 -137
- package/framework/app/libs/runtime-libs/nativescript-optimized-with-inspector.aar +0 -0
- package/framework/app/libs/runtime-libs/nativescript-optimized.aar +0 -0
- package/framework/app/libs/runtime-libs/nativescript-regular.aar +0 -0
- package/framework/build-tools/android-metadata-generator.jar +0 -0
- package/framework/build-tools/dts-generator.jar +0 -0
- package/framework/build-tools/static-binding-generator.jar +0 -0
- package/framework/build.gradle +2 -2
- package/framework/gradle.properties +4 -4
- package/package.json +2 -2
|
@@ -65,6 +65,7 @@ def SBG_BINDINGS_NAME = "sbg-bindings.txt"
|
|
|
65
65
|
def SBG_INTERFACE_NAMES = "sbg-interface-names.txt"
|
|
66
66
|
def INPUT_JS_DIR = "$projectDir/src/main/assets/app"
|
|
67
67
|
def OUTPUT_JAVA_DIR = "$projectDir/src/main/java"
|
|
68
|
+
def APP_DIR = "$projectDir/src/main/assets/app"
|
|
68
69
|
|
|
69
70
|
//metadata generator
|
|
70
71
|
def MDG_OUTPUT_DIR = "mdg-output-dir.txt"
|
|
@@ -78,6 +79,7 @@ def allJarLibraries = new LinkedList<String>()
|
|
|
78
79
|
|
|
79
80
|
def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
|
|
80
81
|
def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
|
|
82
|
+
def computeMinSdkVersion = { -> project.hasProperty("minSdk") ? minSdk : NS_DEFAULT_MIN_SDK_VERSION as int }
|
|
81
83
|
def computeBuildToolsVersion = { ->
|
|
82
84
|
project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
|
|
83
85
|
}
|
|
@@ -179,7 +181,31 @@ def setAppIdentifier = { ->
|
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
|
|
184
|
+
def computeNamespace = { ->
|
|
185
|
+
def appPackageJsonFile = file("${APP_DIR}/$PACKAGE_JSON")
|
|
186
|
+
|
|
187
|
+
if (appPackageJsonFile.exists()) {
|
|
188
|
+
def content = appPackageJsonFile.getText("UTF-8")
|
|
189
|
+
|
|
190
|
+
def jsonSlurper = new JsonSlurper()
|
|
191
|
+
def packageJsonMap = jsonSlurper.parseText(content)
|
|
192
|
+
|
|
193
|
+
def appIdentifier = ""
|
|
194
|
+
|
|
195
|
+
if (packageJsonMap && packageJsonMap.id) {
|
|
196
|
+
appIdentifier = packageJsonMap.id
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
|
|
200
|
+
if (appIdentifier) {
|
|
201
|
+
return appIdentifier
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
return "com.tns.testapplication"
|
|
205
|
+
}
|
|
206
|
+
|
|
182
207
|
android {
|
|
208
|
+
namespace computeNamespace()
|
|
183
209
|
|
|
184
210
|
applyBeforePluginGradleConfiguration()
|
|
185
211
|
|
|
@@ -192,7 +218,7 @@ android {
|
|
|
192
218
|
|
|
193
219
|
defaultConfig {
|
|
194
220
|
def manifest = new XmlSlurper().parse(file(android.sourceSets.main.manifest.srcFile))
|
|
195
|
-
def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?:
|
|
221
|
+
def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: computeMinSdkVersion()
|
|
196
222
|
minSdkVersion minSdkVer
|
|
197
223
|
targetSdkVersion computeTargetSdkVersion()
|
|
198
224
|
ndk {
|
|
@@ -235,7 +261,6 @@ android {
|
|
|
235
261
|
}
|
|
236
262
|
}
|
|
237
263
|
|
|
238
|
-
namespace "com.tns.testapplication"
|
|
239
264
|
setAppIdentifier()
|
|
240
265
|
applyPluginGradleConfigurations()
|
|
241
266
|
applyAppGradleConfiguration()
|
|
@@ -390,7 +415,7 @@ dependencies {
|
|
|
390
415
|
///////////////////////////// CONFIGURATION PHASE //////////////////////////////////
|
|
391
416
|
////////////////////////////////////////////////////////////////////////////////////
|
|
392
417
|
|
|
393
|
-
|
|
418
|
+
task 'addDependenciesFromNativeScriptPlugins' {
|
|
394
419
|
nativescriptDependencies.each { dep ->
|
|
395
420
|
def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.aar"])
|
|
396
421
|
aarFiles.each { aarFile ->
|
|
@@ -411,7 +436,7 @@ tasks.register('addDependenciesFromNativeScriptPlugins') {
|
|
|
411
436
|
}
|
|
412
437
|
}
|
|
413
438
|
|
|
414
|
-
|
|
439
|
+
task 'addDependenciesFromAppResourcesLibraries' {
|
|
415
440
|
def appResourcesPath = getAppResourcesPath()
|
|
416
441
|
def appResourcesLibraries = file("$appResourcesPath/Android/libs")
|
|
417
442
|
if (appResourcesLibraries.exists()) {
|
|
@@ -446,7 +471,7 @@ if (failOnCompilationWarningsEnabled()) {
|
|
|
446
471
|
///////////////////////////// EXECUTION PHASE /////////////////////////////////////
|
|
447
472
|
////////////////////////////////////////////////////////////////////////////////////
|
|
448
473
|
|
|
449
|
-
|
|
474
|
+
task runSbg(type: BuildToolTask) {
|
|
450
475
|
dependsOn "collectAllJars"
|
|
451
476
|
def rootPath = ""
|
|
452
477
|
if (!findProject(':static-binding-generator').is(null)) {
|
|
@@ -591,7 +616,7 @@ def processJar(File jar, jars) {
|
|
|
591
616
|
}
|
|
592
617
|
}
|
|
593
618
|
|
|
594
|
-
|
|
619
|
+
task 'cleanupAllJars' {
|
|
595
620
|
// We depend on the list of libs directories that might contain aar or jar files
|
|
596
621
|
// and on the list of all discovered jars
|
|
597
622
|
inputs.files(pluginDependencies)
|
|
@@ -616,7 +641,7 @@ tasks.register('cleanupAllJars') {
|
|
|
616
641
|
|
|
617
642
|
|
|
618
643
|
// Placeholder task which depends on all dynamically generated extraction tasks
|
|
619
|
-
|
|
644
|
+
task 'extractAllJars' {
|
|
620
645
|
dependsOn cleanupAllJars
|
|
621
646
|
outputs.files extractAllJarsTimestamp
|
|
622
647
|
|
|
@@ -625,7 +650,7 @@ tasks.register('extractAllJars') {
|
|
|
625
650
|
}
|
|
626
651
|
}
|
|
627
652
|
|
|
628
|
-
|
|
653
|
+
task 'collectAllJars' {
|
|
629
654
|
dependsOn extractAllJars
|
|
630
655
|
description "gathers all paths to jar dependencies before building metadata with them"
|
|
631
656
|
|
|
@@ -663,12 +688,12 @@ tasks.register('collectAllJars') {
|
|
|
663
688
|
}
|
|
664
689
|
}
|
|
665
690
|
|
|
666
|
-
|
|
691
|
+
task copyMetadataFilters(type: Copy) {
|
|
667
692
|
from "$rootDir/whitelist.mdg", "$rootDir/blacklist.mdg"
|
|
668
693
|
into "$BUILD_TOOLS_PATH"
|
|
669
694
|
}
|
|
670
695
|
|
|
671
|
-
|
|
696
|
+
task 'copyMetadata' {
|
|
672
697
|
doLast {
|
|
673
698
|
copy {
|
|
674
699
|
from "$projectDir/src/main/assets/metadata"
|
|
@@ -694,13 +719,169 @@ def listf(String directoryName, ArrayList<File> store) {
|
|
|
694
719
|
return resultList
|
|
695
720
|
}
|
|
696
721
|
|
|
697
|
-
|
|
722
|
+
task buildMetadata(type: BuildToolTask) {
|
|
698
723
|
def rootPath = ""
|
|
699
724
|
if (!findProject(':android-metadata-generator').is(null)) {
|
|
700
725
|
rootPath = Paths.get(project(':android-metadata-generator').projectDir.path, "build/libs").toString()
|
|
701
726
|
dependsOn ':android-metadata-generator:jar'
|
|
702
727
|
}
|
|
703
728
|
|
|
729
|
+
|
|
730
|
+
|
|
731
|
+
android.applicationVariants.all { variant ->
|
|
732
|
+
def buildTypeName = variant.buildType.name.capitalize()
|
|
733
|
+
def mergeShadersTaskName = "merge${buildTypeName}Shaders"
|
|
734
|
+
def mergeShadersTask = tasks.findByName(mergeShadersTaskName)
|
|
735
|
+
|
|
736
|
+
if (mergeShadersTask) {
|
|
737
|
+
dependsOn mergeShadersTask
|
|
738
|
+
}
|
|
739
|
+
|
|
740
|
+
def compileJavaWithJavacTaskName = "compile${buildTypeName}JavaWithJavac"
|
|
741
|
+
def compileJavaWithJavacTask = tasks.findByName(compileJavaWithJavacTaskName)
|
|
742
|
+
|
|
743
|
+
|
|
744
|
+
if (compileJavaWithJavacTask) {
|
|
745
|
+
dependsOn compileJavaWithJavacTask
|
|
746
|
+
}
|
|
747
|
+
|
|
748
|
+
def compileKotlinTaskName = "compile${buildTypeName}Kotlin"
|
|
749
|
+
def compileKotlinTask = tasks.findByName(compileKotlinTaskName)
|
|
750
|
+
|
|
751
|
+
|
|
752
|
+
if (compileKotlinTask) {
|
|
753
|
+
dependsOn compileKotlinTask
|
|
754
|
+
}
|
|
755
|
+
|
|
756
|
+
|
|
757
|
+
def mergeDexTaskName = "mergeDex${buildTypeName}"
|
|
758
|
+
def mergeDexTask = tasks.findByName(mergeDexTaskName)
|
|
759
|
+
|
|
760
|
+
if (mergeDexTask) {
|
|
761
|
+
dependsOn mergeDexTask
|
|
762
|
+
}
|
|
763
|
+
|
|
764
|
+
def checkDuplicateClassesTaskName = "check${buildTypeName}DuplicateClasses"
|
|
765
|
+
def checkDuplicateClassesTask = tasks.findByName(checkDuplicateClassesTaskName)
|
|
766
|
+
|
|
767
|
+
if (checkDuplicateClassesTask) {
|
|
768
|
+
dependsOn checkDuplicateClassesTask
|
|
769
|
+
}
|
|
770
|
+
|
|
771
|
+
def generateBuildConfigTaskName = "generate${buildTypeName}BuildConfig"
|
|
772
|
+
def generateBuildConfigTask = tasks.findByName(generateBuildConfigTaskName)
|
|
773
|
+
|
|
774
|
+
if (generateBuildConfigTask) {
|
|
775
|
+
dependsOn generateBuildConfigTask
|
|
776
|
+
}
|
|
777
|
+
|
|
778
|
+
def dexBuilderTaskName = "dexBuilder${buildTypeName}"
|
|
779
|
+
def dexBuilderTask = tasks.findByName(dexBuilderTaskName)
|
|
780
|
+
|
|
781
|
+
if (dexBuilderTask) {
|
|
782
|
+
dependsOn dexBuilderTask
|
|
783
|
+
}
|
|
784
|
+
|
|
785
|
+
|
|
786
|
+
def mergeExtDexTaskName = "mergeExtDex${buildTypeName}"
|
|
787
|
+
def mergeExtDexTask = tasks.findByName(mergeExtDexTaskName)
|
|
788
|
+
|
|
789
|
+
if (mergeExtDexTask) {
|
|
790
|
+
dependsOn mergeExtDexTask
|
|
791
|
+
}
|
|
792
|
+
|
|
793
|
+
def mergeLibDexTaskName = "mergeLibDex${buildTypeName}"
|
|
794
|
+
def mergeLibDexTask = tasks.findByName(mergeLibDexTaskName)
|
|
795
|
+
|
|
796
|
+
if (mergeLibDexTask) {
|
|
797
|
+
dependsOn mergeLibDexTask
|
|
798
|
+
}
|
|
799
|
+
|
|
800
|
+
def mergeProjectDexTaskName = "mergeProjectDex${buildTypeName}"
|
|
801
|
+
def mergeProjectDexTask = tasks.findByName(mergeProjectDexTaskName)
|
|
802
|
+
|
|
803
|
+
if (mergeProjectDexTask) {
|
|
804
|
+
dependsOn mergeProjectDexTask
|
|
805
|
+
}
|
|
806
|
+
|
|
807
|
+
def syncLibJarsTaskName = "sync${buildTypeName}LibJars"
|
|
808
|
+
def syncLibJarsTask = tasks.findByName(syncLibJarsTaskName)
|
|
809
|
+
|
|
810
|
+
if (syncLibJarsTask) {
|
|
811
|
+
dependsOn syncLibJarsTask
|
|
812
|
+
}
|
|
813
|
+
|
|
814
|
+
def mergeJavaResourceTaskName = "merge${buildTypeName}JavaResource"
|
|
815
|
+
def mergeJavaResourceTask = tasks.findByName(mergeJavaResourceTaskName)
|
|
816
|
+
|
|
817
|
+
if (mergeJavaResourceTask) {
|
|
818
|
+
dependsOn mergeJavaResourceTask
|
|
819
|
+
}
|
|
820
|
+
|
|
821
|
+
def mergeJniLibFoldersTaskName = "merge${buildTypeName}JniLibFolders"
|
|
822
|
+
def mergeJniLibFoldersTask = tasks.findByName(mergeJniLibFoldersTaskName)
|
|
823
|
+
|
|
824
|
+
if (mergeJniLibFoldersTask) {
|
|
825
|
+
dependsOn mergeJniLibFoldersTask
|
|
826
|
+
}
|
|
827
|
+
|
|
828
|
+
def mergeNativeLibsTaskName = "merge${buildTypeName}NativeLibs"
|
|
829
|
+
def mergeNativeLibsTask = tasks.findByName(mergeNativeLibsTaskName)
|
|
830
|
+
|
|
831
|
+
if (mergeNativeLibsTask) {
|
|
832
|
+
dependsOn mergeNativeLibsTask
|
|
833
|
+
}
|
|
834
|
+
|
|
835
|
+
def stripDebugSymbolsTaskName = "strip${buildTypeName}DebugSymbols"
|
|
836
|
+
def stripDebugSymbolsTask = tasks.findByName(stripDebugSymbolsTaskName)
|
|
837
|
+
|
|
838
|
+
if (stripDebugSymbolsTask) {
|
|
839
|
+
dependsOn stripDebugSymbolsTask
|
|
840
|
+
}
|
|
841
|
+
|
|
842
|
+
def validateSigningTaskName = "validateSigning${buildTypeName}"
|
|
843
|
+
def validateSigningTask = tasks.findByName(validateSigningTaskName)
|
|
844
|
+
|
|
845
|
+
if (validateSigningTask) {
|
|
846
|
+
dependsOn validateSigningTask
|
|
847
|
+
}
|
|
848
|
+
|
|
849
|
+
|
|
850
|
+
def extractProguardFilesTaskName = "extractProguardFiles"
|
|
851
|
+
def extractProguardFilesTask = tasks.findByName(extractProguardFilesTaskName)
|
|
852
|
+
|
|
853
|
+
if (extractProguardFilesTask) {
|
|
854
|
+
dependsOn extractProguardFilesTask
|
|
855
|
+
}
|
|
856
|
+
|
|
857
|
+
|
|
858
|
+
def compileArtProfileTaskName = "compile${buildTypeName}ArtProfile"
|
|
859
|
+
def compileArtProfileTask = tasks.findByName(compileArtProfileTaskName)
|
|
860
|
+
|
|
861
|
+
if (compileArtProfileTask) {
|
|
862
|
+
dependsOn compileArtProfileTask
|
|
863
|
+
}
|
|
864
|
+
|
|
865
|
+
|
|
866
|
+
def extractNativeSymbolTablesTaskName = "extract${buildTypeName}NativeSymbolTables"
|
|
867
|
+
def extractNativeSymbolTablesTask = tasks.findByName(extractNativeSymbolTablesTaskName)
|
|
868
|
+
|
|
869
|
+
if (extractNativeSymbolTablesTask) {
|
|
870
|
+
dependsOn extractNativeSymbolTablesTask
|
|
871
|
+
}
|
|
872
|
+
|
|
873
|
+
|
|
874
|
+
def optimizeResourcesTaskName = "optimize${buildTypeName}Resources"
|
|
875
|
+
def optimizeResourcesTask = tasks.findByName(optimizeResourcesTaskName)
|
|
876
|
+
|
|
877
|
+
if (optimizeResourcesTask) {
|
|
878
|
+
dependsOn optimizeResourcesTask
|
|
879
|
+
}
|
|
880
|
+
|
|
881
|
+
|
|
882
|
+
|
|
883
|
+
}
|
|
884
|
+
|
|
704
885
|
dependsOn copyMetadataFilters
|
|
705
886
|
|
|
706
887
|
// 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
|
|
@@ -817,7 +998,7 @@ tasks.register('buildMetadata', BuildToolTask) {
|
|
|
817
998
|
}
|
|
818
999
|
}
|
|
819
1000
|
|
|
820
|
-
|
|
1001
|
+
task generateTypescriptDefinitions(type: BuildToolTask) {
|
|
821
1002
|
if (!findProject(':dts-generator').is(null)) {
|
|
822
1003
|
dependsOn ':dts-generator:jar'
|
|
823
1004
|
}
|
|
@@ -871,7 +1052,7 @@ static def shouldIncludeDirForTypings(path, includeDirs) {
|
|
|
871
1052
|
return false
|
|
872
1053
|
}
|
|
873
1054
|
|
|
874
|
-
|
|
1055
|
+
task 'copyTypings' {
|
|
875
1056
|
doLast {
|
|
876
1057
|
outLogger.withStyle(Style.Info).println "Copied generated typings to application root level. Make sure to import android.d.ts in reference.d.ts"
|
|
877
1058
|
|
|
@@ -885,7 +1066,7 @@ tasks.register('copyTypings') {
|
|
|
885
1066
|
copyTypings.onlyIf { generateTypescriptDefinitions.didWork }
|
|
886
1067
|
generateTypescriptDefinitions.finalizedBy(copyTypings)
|
|
887
1068
|
|
|
888
|
-
|
|
1069
|
+
task 'validateAppIdMatch' {
|
|
889
1070
|
doLast {
|
|
890
1071
|
def lineSeparator = System.getProperty("line.separator")
|
|
891
1072
|
|
|
@@ -908,7 +1089,7 @@ tasks.register('validateAppIdMatch') {
|
|
|
908
1089
|
////////////////////////////////////////////////////////////////////////////////////
|
|
909
1090
|
|
|
910
1091
|
//////// custom clean ///////////
|
|
911
|
-
|
|
1092
|
+
task cleanSbg(type: Delete) {
|
|
912
1093
|
delete "$BUILD_TOOLS_PATH/$SBG_JS_PARSED_FILES",
|
|
913
1094
|
"$BUILD_TOOLS_PATH/$SBG_JAVA_DEPENDENCIES",
|
|
914
1095
|
"$BUILD_TOOLS_PATH/$SBG_INTERFACE_NAMES",
|
|
@@ -919,7 +1100,7 @@ tasks.register('cleanSbg', Delete) {
|
|
|
919
1100
|
"$OUTPUT_JAVA_DIR/com/tns/gen"
|
|
920
1101
|
}
|
|
921
1102
|
|
|
922
|
-
|
|
1103
|
+
task cleanMdg(type: Delete) {
|
|
923
1104
|
delete "$BUILD_TOOLS_PATH/$MDG_OUTPUT_DIR",
|
|
924
1105
|
"$BUILD_TOOLS_PATH/whitelist.mdg",
|
|
925
1106
|
"$BUILD_TOOLS_PATH/blacklist.mdg",
|
|
@@ -931,28 +1112,35 @@ cleanSbg.dependsOn(cleanMdg)
|
|
|
931
1112
|
clean.dependsOn(cleanSbg)
|
|
932
1113
|
|
|
933
1114
|
|
|
1115
|
+
//dependsOn {
|
|
1116
|
+
// pattern {
|
|
1117
|
+
// include "merge*.Shaders" // Matches tasks starting with "merge" and ending with "Shaders"
|
|
1118
|
+
// }
|
|
1119
|
+
//}
|
|
1120
|
+
|
|
1121
|
+
|
|
934
1122
|
tasks.configureEach({ DefaultTask currentTask ->
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
currentTask.finalizedBy(extractAllJars)
|
|
938
|
-
extractAllJars.finalizedBy(collectAllJars)
|
|
939
|
-
}
|
|
1123
|
+
// println "\t ~ [DEBUG][app] build.gradle - currentTask = ${currentTask.name} ..."
|
|
1124
|
+
|
|
940
1125
|
if (currentTask =~ /compile.+JavaWithJavac/) {
|
|
941
1126
|
currentTask.dependsOn(runSbg)
|
|
942
|
-
|
|
1127
|
+
}
|
|
1128
|
+
|
|
1129
|
+
if (currentTask =~ /mergeDex.+/) {
|
|
1130
|
+
currentTask.dependsOn(runSbg)
|
|
943
1131
|
}
|
|
944
1132
|
|
|
945
1133
|
if (currentTask =~ /compile.+Kotlin.+/) {
|
|
946
1134
|
currentTask.dependsOn(runSbg)
|
|
947
|
-
currentTask.finalizedBy(buildMetadata)
|
|
948
1135
|
}
|
|
949
1136
|
|
|
950
1137
|
if (currentTask =~ /merge.*Assets/) {
|
|
951
1138
|
currentTask.dependsOn(buildMetadata)
|
|
952
1139
|
}
|
|
953
|
-
|
|
1140
|
+
|
|
1141
|
+
// // ensure buildMetadata is done before R8 to allow custom proguard from metadata
|
|
954
1142
|
if (currentTask =~ /minify.*WithR8/) {
|
|
955
|
-
|
|
1143
|
+
buildMetadata.finalizedBy(currentTask)
|
|
956
1144
|
}
|
|
957
1145
|
if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) {
|
|
958
1146
|
currentTask.finalizedBy("validateAppIdMatch")
|
|
@@ -962,124 +1150,146 @@ tasks.configureEach({ DefaultTask currentTask ->
|
|
|
962
1150
|
cleanupAllJars.dependsOn(currentTask)
|
|
963
1151
|
}
|
|
964
1152
|
|
|
965
|
-
if (currentTask
|
|
966
|
-
currentTask.
|
|
967
|
-
}
|
|
968
|
-
|
|
969
|
-
if (currentTask =~ /mergeDex.+/) {
|
|
970
|
-
currentTask.dependsOn(buildMetadata)
|
|
971
|
-
}
|
|
972
|
-
|
|
973
|
-
if (currentTask =~ /dexBuilder.+/) {
|
|
974
|
-
currentTask.dependsOn(buildMetadata)
|
|
975
|
-
}
|
|
976
|
-
|
|
977
|
-
if (currentTask =~ /mergeExtDex.+/) {
|
|
978
|
-
currentTask.finalizedBy(buildMetadata)
|
|
979
|
-
}
|
|
980
|
-
|
|
981
|
-
if (currentTask =~ /mergeLibDex.+/) {
|
|
982
|
-
currentTask.finalizedBy(buildMetadata)
|
|
983
|
-
}
|
|
984
|
-
|
|
985
|
-
if (currentTask =~ /mergeProjectDex.+/) {
|
|
986
|
-
currentTask.finalizedBy(buildMetadata)
|
|
987
|
-
}
|
|
988
|
-
|
|
989
|
-
if (currentTask =~ /merge.+NativeLibs/) {
|
|
990
|
-
currentTask.finalizedBy(buildMetadata)
|
|
991
|
-
}
|
|
992
|
-
|
|
993
|
-
if (currentTask =~ /sync.+LibJars/) {
|
|
994
|
-
currentTask.finalizedBy(buildMetadata)
|
|
995
|
-
}
|
|
996
|
-
|
|
997
|
-
if (currentTask.name == "extractProguardFiles") {
|
|
998
|
-
currentTask.finalizedBy(buildMetadata)
|
|
999
|
-
}
|
|
1000
|
-
|
|
1153
|
+
// if (currentTask.name == "extractProguardFiles") {
|
|
1154
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1155
|
+
// }
|
|
1156
|
+
//
|
|
1001
1157
|
if (currentTask =~ /generate.+LintVitalReportModel/) {
|
|
1002
|
-
currentTask.dependsOn buildMetadata
|
|
1003
|
-
}
|
|
1004
|
-
|
|
1005
|
-
if (currentTask =~ /lintVitalAnalyze.+/) {
|
|
1006
|
-
currentTask.dependsOn(buildMetadata)
|
|
1007
|
-
}
|
|
1008
|
-
|
|
1009
|
-
if (currentTask =~ /extract.+NativeSymbolTables/) {
|
|
1010
|
-
currentTask.dependsOn(buildMetadata)
|
|
1011
|
-
}
|
|
1012
|
-
|
|
1013
|
-
if (currentTask =~ /merge.+GlobalSynthetics/) {
|
|
1014
1158
|
currentTask.dependsOn(buildMetadata)
|
|
1015
1159
|
}
|
|
1016
1160
|
|
|
1017
|
-
if (currentTask =~ /
|
|
1018
|
-
currentTask.dependsOn(buildMetadata)
|
|
1019
|
-
}
|
|
1020
|
-
|
|
1021
|
-
if (currentTask =~ /buildCMake.*/) {
|
|
1022
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1023
|
-
}
|
|
1024
|
-
|
|
1025
|
-
if (currentTask =~ /configureCMake.*/) {
|
|
1026
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1027
|
-
}
|
|
1028
|
-
|
|
1029
|
-
if (currentTask =~ /validateSigning.*/) {
|
|
1030
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1031
|
-
}
|
|
1032
|
-
|
|
1033
|
-
if (currentTask =~ /generate.*LintReportModel/) {
|
|
1034
|
-
currentTask.dependsOn(buildMetadata)
|
|
1035
|
-
}
|
|
1036
|
-
|
|
1037
|
-
if (currentTask.name.contains(":runtime:configureCMakeRelWithDebInfo")) {
|
|
1038
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1039
|
-
}
|
|
1040
|
-
|
|
1041
|
-
if (currentTask =~ /generate.*AndroidTestResValues/) {
|
|
1042
|
-
currentTask.dependsOn(buildMetadata)
|
|
1043
|
-
}
|
|
1044
|
-
|
|
1045
|
-
if (currentTask =~ /generate.*AndroidTestLintModel/) {
|
|
1161
|
+
if (currentTask =~ /lintVitalAnalyze.+/) {
|
|
1046
1162
|
currentTask.dependsOn(buildMetadata)
|
|
1047
1163
|
}
|
|
1164
|
+
//
|
|
1165
|
+
// if (currentTask =~ /merge.+GlobalSynthetics/) {
|
|
1166
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1167
|
+
// }
|
|
1168
|
+
//
|
|
1169
|
+
// if (currentTask =~ /optimize.+Resources/) {
|
|
1170
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1171
|
+
// }
|
|
1172
|
+
//
|
|
1173
|
+
// if (currentTask =~ /buildCMake.*/) {
|
|
1174
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1175
|
+
// }
|
|
1176
|
+
//
|
|
1177
|
+
// if (currentTask =~ /configureCMake.*/) {
|
|
1178
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1179
|
+
// }
|
|
1180
|
+
//
|
|
1181
|
+
// if (currentTask =~ /validateSigning.*/) {
|
|
1182
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1183
|
+
// }
|
|
1184
|
+
//
|
|
1185
|
+
// if (currentTask =~ /generate.*LintReportModel/) {
|
|
1186
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1187
|
+
// }
|
|
1188
|
+
//
|
|
1189
|
+
// if (currentTask =~ /generate.*AndroidTestResValues/) {
|
|
1190
|
+
// // buildMetadata.dependsOn(currentTask)
|
|
1191
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1192
|
+
// }
|
|
1193
|
+
//
|
|
1194
|
+
// if (currentTask =~ /generate.*AndroidTestLintModel/) {
|
|
1195
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1196
|
+
// }
|
|
1197
|
+
//
|
|
1198
|
+
// if (currentTask =~ /generate.*UnitTestLintModel/) {
|
|
1199
|
+
// buildMetadata.mustRunAfter(currentTask)
|
|
1200
|
+
// }
|
|
1201
|
+
//
|
|
1202
|
+
// if (currentTask =~ /generate.*UnitTestLintModel/) {
|
|
1203
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1204
|
+
// }
|
|
1205
|
+
//
|
|
1206
|
+
//
|
|
1207
|
+
// if (currentTask =~ /lintAnalyze.*UnitTest/) {
|
|
1208
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1209
|
+
// }
|
|
1210
|
+
//
|
|
1211
|
+
// if (currentTask =~ /process.*JavaRes/) {
|
|
1212
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1213
|
+
// }
|
|
1214
|
+
//
|
|
1215
|
+
// if (currentTask =~ /strip.*DebugSymbols/) {
|
|
1216
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1217
|
+
// }
|
|
1218
|
+
//
|
|
1219
|
+
// if (currentTask =~ /merge.*JavaResource/) {
|
|
1220
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1221
|
+
// }
|
|
1222
|
+
//
|
|
1223
|
+
// if (currentTask =~ /lintAnalyze.*/) {
|
|
1224
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1225
|
+
// }
|
|
1226
|
+
//
|
|
1227
|
+
// if (currentTask =~ /lintAnalyze.*AndroidTest/) {
|
|
1228
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1229
|
+
// }
|
|
1230
|
+
//
|
|
1231
|
+
// if (currentTask =~ /bundle.*Resources/) {
|
|
1232
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1233
|
+
// }
|
|
1234
|
+
//
|
|
1235
|
+
// if (currentTask =~ /compile.*ArtProfile/) {
|
|
1236
|
+
// currentTask.mustRunAfter(buildMetadata)
|
|
1237
|
+
// }
|
|
1238
|
+
//
|
|
1239
|
+
// if (currentTask =~ /check.*DuplicateClasses/) {
|
|
1240
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1241
|
+
// }
|
|
1242
|
+
//
|
|
1243
|
+
// if (currentTask =~ /check.*AarMetadata/) {
|
|
1244
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1245
|
+
// }
|
|
1246
|
+
//
|
|
1247
|
+
// if (currentTask =~ /create.*CompatibleScreenManifests/) {
|
|
1248
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1249
|
+
// }
|
|
1250
|
+
//
|
|
1251
|
+
// if (currentTask =~ /process.*Manifest/) {
|
|
1252
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1253
|
+
// }
|
|
1254
|
+
//
|
|
1255
|
+
// if (currentTask =~ /generate.*ResValues/) {
|
|
1256
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1257
|
+
// }
|
|
1258
|
+
//
|
|
1259
|
+
// if (currentTask =~ /merge.*Resources/) {
|
|
1260
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1261
|
+
// }
|
|
1262
|
+
//
|
|
1263
|
+
// if (currentTask =~ /package.*Resources/) {
|
|
1264
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1265
|
+
// }
|
|
1266
|
+
//
|
|
1267
|
+
// if (currentTask =~ /process.*Resources/) {
|
|
1268
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1269
|
+
// }
|
|
1270
|
+
//
|
|
1271
|
+
// if (currentTask =~ /desugar.*Dependencies/) {
|
|
1272
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1273
|
+
// }
|
|
1274
|
+
//
|
|
1275
|
+
// if (currentTask =~ /merge.*JniLibFolders/) {
|
|
1276
|
+
// currentTask.finalizedBy(buildMetadata)
|
|
1277
|
+
// }
|
|
1048
1278
|
|
|
1049
|
-
|
|
1050
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1051
|
-
}
|
|
1052
|
-
|
|
1053
|
-
if (currentTask =~ /generate.*UnitTestLintModel/) {
|
|
1054
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1055
|
-
}
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
if (currentTask =~ /lintAnalyze.*UnitTest/) {
|
|
1059
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1060
|
-
}
|
|
1061
|
-
|
|
1062
|
-
if (currentTask =~ /process.*JavaRes/) {
|
|
1063
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1064
|
-
}
|
|
1065
|
-
|
|
1066
|
-
if (currentTask =~ /strip.*DebugSymbols/) {
|
|
1067
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1068
|
-
}
|
|
1069
|
-
|
|
1070
|
-
if (currentTask =~ /merge.*JavaResource/) {
|
|
1071
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1072
|
-
}
|
|
1073
|
-
|
|
1074
|
-
if (currentTask.name == ":runtime:lintAnalyzeDebugAndroidTest" || currentTask.name == ":runtime:lintAnalyzeReleaseAndroidTest") {
|
|
1075
|
-
currentTask.finalizedBy(buildMetadata)
|
|
1076
|
-
}
|
|
1279
|
+
})
|
|
1077
1280
|
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1281
|
+
rootProject.subprojects.forEach {
|
|
1282
|
+
it.tasks.configureEach({ DefaultTask currentTask ->
|
|
1283
|
+
if (currentTask =~ /.+bundleLibCompileToJar.*/) {
|
|
1284
|
+
currentTask.finalizedBy(cleanupAllJars)
|
|
1285
|
+
}
|
|
1081
1286
|
|
|
1082
|
-
|
|
1083
|
-
|
|
1084
|
-
|
|
1085
|
-
|
|
1287
|
+
if (currentTask =~ /bundleLibRuntimeToDir.*/) {
|
|
1288
|
+
currentTask.finalizedBy(buildMetadata)
|
|
1289
|
+
}
|
|
1290
|
+
|
|
1291
|
+
if (currentTask =~ /compile.*LibraryResources/) {
|
|
1292
|
+
currentTask.finalizedBy(buildMetadata)
|
|
1293
|
+
}
|
|
1294
|
+
})
|
|
1295
|
+
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/framework/build.gradle
CHANGED
|
@@ -24,9 +24,9 @@ NS_DEFAULT_COMPILE_SDK_VERSION=34
|
|
|
24
24
|
NS_DEFAULT_MIN_SDK_VERSION=17
|
|
25
25
|
NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.3.2
|
|
26
26
|
|
|
27
|
-
ns_default_androidx_appcompat_version = 1.
|
|
27
|
+
ns_default_androidx_appcompat_version = 1.5.1
|
|
28
28
|
ns_default_androidx_exifinterface_version = 1.3.7
|
|
29
|
-
ns_default_androidx_fragment_version = 1.
|
|
29
|
+
ns_default_androidx_fragment_version = 1.5.7
|
|
30
30
|
ns_default_androidx_material_version = 1.8.0
|
|
31
31
|
ns_default_androidx_multidex_version = 2.0.1
|
|
32
32
|
ns_default_androidx_transition_version = 1.4.1
|
|
@@ -39,7 +39,7 @@ ns_default_google_java_format_version = 1.6
|
|
|
39
39
|
ns_default_gson_version = 2.10.1
|
|
40
40
|
ns_default_json_version = 20180813
|
|
41
41
|
ns_default_junit_version = 4.13.2
|
|
42
|
-
ns_default_kotlin_version = 2.0.0
|
|
43
|
-
ns_default_kotlinx_metadata_jvm_version = 2.0.0
|
|
42
|
+
ns_default_kotlin_version = 2.0.0
|
|
43
|
+
ns_default_kotlinx_metadata_jvm_version = 2.0.0
|
|
44
44
|
ns_default_mockito_core_version = 3.0.0
|
|
45
45
|
ns_default_spotbugs_version = 3.1.12
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nativescript/android",
|
|
3
3
|
"description": "NativeScript for Android using v8",
|
|
4
|
-
"version": "8.8.0-alpha.
|
|
4
|
+
"version": "8.8.0-alpha.10",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/NativeScript/android.git"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"minSdk": "17",
|
|
19
19
|
"compileSdk": "34",
|
|
20
20
|
"buildTools": "34.0.0",
|
|
21
|
-
"kotlin": "2.0.0
|
|
21
|
+
"kotlin": "2.0.0"
|
|
22
22
|
},
|
|
23
23
|
"// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
|
|
24
24
|
"gradle": {
|