feat: many new android features #5774

farfromrefug · 2023-12-24T16:01:50Z

Thought it was time to make that big PR. It is quite impossible now to divide everything as each part depends on the other.
I really hope we can make that work for everyone to enjoy the new features.
I ll try to list them all. Dont hesitate if you have questions

Gradle 8 support
App/plugins gradle files now included in the CLI and not the runtime. Easier to maintain and pave the way for a possible @nativescript/gradle plugin.
Build only abis of connected devices: Faster build, smaller build => faster installation. Very practical when working on devices like firetv
support custom build path. Essential for monorepo like projects building multiple apps from the same source code. Example project here https://github.com/Akylas/com.akylas.documentscanner
improved timeline JSON to be compatible with firefox
include the PR feat: add --json option to ns config #5773
include the PR feat: new syncChangedDataOnDevices #5772
include the PR feat(android): allow to force gradle version throught nativescript-co… #5764

TODO

There is one thing i would like to improve which is this. I commented on the reason why we need that.
Though i am sure we might find a better solution. The issue with the way i did it if that if new task are added (either tools update of maybe through plugin) that list will need to be update which is ugly. I already had to add tasks added by the sentry plugin...
Maybe @triniwiz you know a way to do it better. I know the reason is that by reading the buildMetada task (or the tasks it depends on like those handling jars) gradle thinks buildMetadata uses as an input the output of all those tasks. TBH i dont really understand fully the code of the buildMetadata task ...

Along with that we simply need to have a cli parameter and an option in nativescript.config

# Conflicts: # lib/services/plugins-service.ts

fix: require.resolve for packages with exports field in package.json

see https://www.mobileit.cz/Blog/Pages/r-class.aspx

can still be enabled with `generateBuildConfig` and `generateR`

# Conflicts: # lib/services/log-source-map-service.ts # lib/services/metadata-filtering-service.ts # lib/services/test-execution-service.ts # vendor/gradle-plugin/build.gradle

# Conflicts: # lib/services/android-plugin-build-service.ts # vendor/gradle-plugin/build.gradle

and other gradle scripts

# Conflicts: # vendor/gradle-app/app/build.gradle

farfromrefug · 2024-03-02T13:36:34Z

@rigor789 any chance to boost this one so that it gets merged?
Maybe an alpha version so that the team can test with their projects?
I have contributors forced to use my fork because we need this

@edusperoni i think you did some work around gradle? I still have to fix the why i need this https://github.com/farfromrefug/nativescript-cli/blob/new_big_merge_test/vendor/gradle-app/app/build.gradle#L986. There is something wrong with our buildMetadata task which makes all tasks depends on it

rigor789

This is a very large changeset - I tried to look through and note things that jumped out.

The tests are also failing:

Test results

1428 passing (23s)
  35 failing

  1) update controller method tests
       handles exact versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  2) update controller method tests
       handles range versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  3) update controller method tests
       handles range versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  4) update controller method tests
       handles latest tag versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  5) update controller method tests
       handles existing tag versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  6) update controller method tests
       handles non-existing tag versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  7) update controller method tests
       handles partially existing tag versions:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  8) update controller method tests
       handles no version - falls back to latest:
     TypeError: this.$projectDataService.getProjectData(...).getBuildRelativeDirectoryPath is not a function
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:299:46)
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/controllers/update-controller.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (lib/controllers/update-controller.js:4:12)
      at UpdateController.cleanUpProject (lib/controllers/update-controller.js:154:16)
      at UpdateController.<anonymous> (lib/controllers/update-controller.ts:112:14)
      at Generator.next (<anonymous>)
      at fulfilled (lib/controllers/update-controller.js:5:58)

  9) Plugins service
       plugin add
         fails when the plugin does not support the installed framework:
     Error: unable to resolve liveSyncProcessDataService
      at Yok.resolveDependency (lib/common/yok.ts:521:10)
      at Yok.resolveByName (lib/common/yok.ts:488:22)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/common/yok.ts:460:17
      at Array.map (<anonymous>)
      at Yok.resolveConstructor (lib/common/yok.ts:456:42)
      at Yok.resolveByName (lib/common/yok.ts:505:21)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/common/yok.ts:460:17
      at Array.map (<anonymous>)
      at Yok.resolveConstructor (lib/common/yok.ts:456:42)
      at Yok.resolveByName (lib/common/yok.ts:505:21)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/plugins-service.ts:427:47
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/plugins-service.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (test/plugins-service.js:4:12)
      at Context.<anonymous> (test/plugins-service.ts:377:84)
      at processImmediate (node:internal/timers:478:21)

  10) Plugins service
       plugin install
         fails when the plugin does not support the installed framework:
     Error: unable to resolve liveSyncProcessDataService
      at Yok.resolveDependency (lib/common/yok.ts:521:10)
      at Yok.resolveByName (lib/common/yok.ts:488:22)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/common/yok.ts:460:17
      at Array.map (<anonymous>)
      at Yok.resolveConstructor (lib/common/yok.ts:456:42)
      at Yok.resolveByName (lib/common/yok.ts:505:21)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/common/yok.ts:460:17
      at Array.map (<anonymous>)
      at Yok.resolveConstructor (lib/common/yok.ts:456:42)
      at Yok.resolveByName (lib/common/yok.ts:505:21)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/plugins-service.ts:427:47
      at Generator.next (<anonymous>)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/plugins-service.js:8:71
      at new Promise (<anonymous>)
      at __awaiter (test/plugins-service.js:4:12)
      at Context.<anonymous> (test/plugins-service.ts:377:84)
      at processImmediate (node:internal/timers:478:21)

  11) androidPluginBuildService
       buildAar
         builds aar when all supported files are in the plugin:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  12) androidPluginBuildService
       buildAar
         builds aar when there are res and assets folders:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  13) androidPluginBuildService
       buildAar
         builds aar when there is an android manifest:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  14) androidPluginBuildService
       buildAar
         builds aar when plugin is already build and source files have changed since last buid:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  15) androidPluginBuildService
       buildAar
         builds aar with the latest runtime gradle versions when no project dir is specified:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  16) androidPluginBuildService
       buildAar
         builds aar with the latest runtime gradle versions when a project dir without runtime versions is specified:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  17) androidPluginBuildService
       buildAar
         builds aar with the specified runtime gradle versions when the project runtime has gradle versions:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  18) androidPluginBuildService
       buildAar
         builds aar with the hardcoded gradle versions when the project runtime and the latest runtime do not have versions specified:
     TypeError: Cannot read properties of undefined (reading 'android')
      at AndroidPluginBuildService.<anonymous> (lib/services/android-plugin-build-service.ts:394:34)
      at Generator.next (<anonymous>)
      at fulfilled (lib/services/android-plugin-build-service.js:11:58)

  19) androidProjectService
       "before each" hook for "release no bundle":
     Error: unable to resolve liveSyncProcessDataService
      at Yok.resolveDependency (lib/common/yok.ts:521:10)
      at Yok.resolveByName (lib/common/yok.ts:488:22)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at /Users/rigor789/Code/NativeScript/nativescript-cli/lib/common/yok.ts:460:17
      at Array.map (<anonymous>)
      at Yok.resolveConstructor (lib/common/yok.ts:456:42)
      at Yok.resolveByName (lib/common/yok.ts:505:21)
      at Yok.resolve (lib/common/yok.ts:416:16)
      at Context.<anonymous> (test/services/android-project-service.ts:88:36)
      at processImmediate (node:internal/timers:478:21)

  20) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for debug build with info log:

      AssertionError: expected [ 'assembleDebug', '--quiet', …(12) ] to deeply equal [ 'assembleDebug', '--quiet', …(9) ]
      + expected - actual

       [
         "assembleDebug"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  21) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for debug build with trace log:

      AssertionError: expected [ 'assembleDebug', …(14) ] to deeply equal [ 'assembleDebug', …(11) ]
      + expected - actual

       [
         "assembleDebug"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  22) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for release build with info log:

      AssertionError: expected [ 'assembleRelease', '--quiet', …(17) ] to deeply equal [ 'assembleRelease', '--quiet', …(14) ]
      + expected - actual

       [
         "assembleRelease"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  23) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for release build with trace log:

      AssertionError: expected [ 'assembleRelease', …(19) ] to deeply equal [ 'assembleRelease', …(16) ]
      + expected - actual

       [
         "assembleRelease"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  24) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for debug build with info log and android bundle:

      AssertionError: expected [ 'bundleDebug', '--quiet', …(12) ] to deeply equal [ 'bundleDebug', '--quiet', …(9) ]
      + expected - actual

       [
         "bundleDebug"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  25) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for debug build with trace log and android bundle:

      AssertionError: expected [ Array(15) ] to deeply equal [ Array(12) ]
      + expected - actual

       [
         "bundleDebug"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  26) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for release build with info log and android bundle:

      AssertionError: expected [ 'bundleRelease', '--quiet', …(17) ] to deeply equal [ 'bundleRelease', '--quiet', …(14) ]
      + expected - actual

       [
         "bundleRelease"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  27) GradleBuildArgsService
       getBuildTaskArgs
         should return correct args for release build with trace log and android bundle:

      AssertionError: expected [ 'bundleRelease', …(19) ] to deeply equal [ 'bundleRelease', …(16) ]
      + expected - actual

       [
         "bundleRelease"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  28) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for debug clean build with info log:

      AssertionError: expected [ 'clean', '--quiet', …(12) ] to deeply equal [ 'clean', '--quiet', …(9) ]
      + expected - actual

       [
         "clean"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  29) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for debug clean build with trace log:

      AssertionError: expected [ 'clean', '--stacktrace', …(13) ] to deeply equal [ 'clean', '--stacktrace', …(10) ]
      + expected - actual

       [
         "clean"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  30) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for release clean build with info log:

      AssertionError: expected [ 'clean', '--quiet', …(17) ] to deeply equal [ 'clean', '--quiet', …(14) ]
      + expected - actual

       [
         "clean"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  31) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for release clean build with trace log:

      AssertionError: expected [ 'clean', '--stacktrace', …(18) ] to deeply equal [ 'clean', '--stacktrace', …(15) ]
      + expected - actual

       [
         "clean"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  32) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for debug clean build with info log and android bundle:

      AssertionError: expected [ 'clean', '--quiet', …(12) ] to deeply equal [ 'clean', '--quiet', …(9) ]
      + expected - actual

       [
         "clean"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  33) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for debug clean build with trace log and android bundle:

      AssertionError: expected [ 'clean', '--stacktrace', …(13) ] to deeply equal [ 'clean', '--stacktrace', …(10) ]
      + expected - actual

       [
         "clean"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
       ]

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  34) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for release clean build with info log and android bundle:

      AssertionError: expected [ 'clean', '--quiet', …(17) ] to deeply equal [ 'clean', '--quiet', …(14) ]
      + expected - actual

       [
         "clean"
         "--quiet"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

  35) GradleBuildArgsService
       getCleanTaskArgs
         should return correct args for release clean build with trace log and android bundle:

      AssertionError: expected [ 'clean', '--stacktrace', …(18) ] to deeply equal [ 'clean', '--stacktrace', …(15) ]
      + expected - actual

       [
         "clean"
         "--stacktrace"
         "--debug"
      -  "--stacktrace"
         "-PcompileSdk=android-28"
         "-PtargetSdk=26"
         "-PbuildToolsVersion=my-build-tools-version"
         "-PgenerateTypings=true"
      +  "-DprojectRoot=/path/to/projectDir"
         "-PprojectRoot=/path/to/projectDir"
      -  "-DprojectRoot=/path/to/projectDir"
         "-PappPath=/path/to/projectDir/app"
         "-PappBuildPath=platforms"
      -  "-DappBuildPath=platforms"
      -  "-PappPath=/path/to/projectDir/app"
         "-PappResourcesPath=/path/to/projectDir/app/App_Resources"
         "-Prelease"
         "-PksPath=/var/folders/7_/qj96kqbd2jz83dlnh9v97p7w0000gn/T/ksPath2024213-80054-1ddb9qk.yi07h"
         "-Palias=keyStoreAlias"

      at /Users/rigor789/Code/NativeScript/nativescript-cli/test/services/android/gradle-build-args-service.ts:57:11
      at Generator.next (<anonymous>)
      at fulfilled (test/services/android/gradle-build-args-service.js:5:58)

lib/controllers/platform-controller.ts

lib/controllers/prepare-controller.ts

rigor789 · 2024-03-13T14:10:27Z

lib/data/build-data.ts

@@ -58,6 +60,8 @@ export class AndroidBuildData extends BuildData {
 		this.keyStoreAliasPassword = data.keyStoreAliasPassword;
 		this.keyStorePassword = data.keyStorePassword;
 		this.androidBundle = data.androidBundle || data.aab;
+		this.buildFilterDevicesArch = !this.androidBundle && data.filterDevicesArch !== false ;
+		this.gradleFlavor = data.flavor;


Should this be named data.gradleFlavor for consistency?

I can yes. But to me flavor is more of an android option than a gradle option. I mean gradlePath and gradleArgs are options for the gradle "tool".
Let me know what you prefer and i ll change

package.json

lib/services/device/device-install-app-service.ts

lib/services/android/gradle-build-args-service.ts

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

…_merge_test

farfromrefug · 2024-03-13T17:49:52Z

@rigor789 I am sorry I resolved by mistake the conflicts I pushed fixes for...

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

# Conflicts: # lib/services/plugins-service.ts

farfromrefug · 2024-03-14T08:47:17Z

@rigor789 now all tests are passing here

rigor789

Running ns debug android always rebuilds the app - traced it back to android-project-service.ts setting nativeChanged = true.

This is related to the ABI filtering, is the build supposed to always create <abi>.*.apk? Because it's not doing that:

rigor789 · 2024-04-02T18:13:55Z

lib/services/android-project-service.ts

+					return regexp.test(entry);
+				});
+				if (files.length === 0) {
+					changesInfo.nativeChanged = true;


@farfromrefug this seems to be causing a rebuild every time you run ns debug android.

@farfromrefug possible to adjust that portion to not rebuild on initial run?

@NathanWalker we started discussing that with @rigor789. I proposed to add a test to detect universal builds (through apk name). If we agree on that (or another solution) i ll implement it

farfromrefug and others added 30 commits May 7, 2021 17:05

feat: allow to ignore native dependencies

cb695e6

Along with that we simply need to have a cli parameter and an option in nativescript.config

merge

0005db5

Merge branch 'master' of github.com:NativeScript/nativescript-cli

66fc8b1

fix allow plugins to use kt files

ae75c50

fix: remove plugins duplicates

5c8db12

Merge branch 'master' of github.com:NativeScript/nativescript-cli

21a99d3

Merge branch 'master' of github.com:NativeScript/nativescript-cli

bca2b25

# Conflicts: # lib/services/plugins-service.ts

fix: update plugin gradle script

e019098

Merge branch 'master' of github.com:NativeScript/nativescript-cli

06a08b4

fix: require.resolve for packages with exports field in package.json

bafc35f

Merge branch 'NativeScript:master' into master

b8bd8f5

Merge pull request #1 from NativeScript/fix/require-resolve-with-exports

38d2fb4

fix: require.resolve for packages with exports field in package.json

Merge branch 'master' of github.com:farfromrefug/nativescript-cli

3066c6a

feat: allow plugin blacklist metadata

68e541c

fix: fix source map path

8ca0889

chore: refactoring

63a4620

fix: makes libs smaller and build faster

29439ca

see https://www.mobileit.cz/Blog/Pages/r-class.aspx

fix: remove unneeded R.class and BuildConfig.class for plugins

aa56395

can still be enabled with `generateBuildConfig` and `generateR`

feat(android): add gradle 7+ support

e0c1824

Merge branch 'feat/gradle-7' of github.com:NativeScript/nativescript-cli

3dd3744

# Conflicts: # lib/services/log-source-map-service.ts # lib/services/metadata-filtering-service.ts # lib/services/test-execution-service.ts # vendor/gradle-plugin/build.gradle

chore: cleanup

9f66f72

Merge branch 'master' of github.com:NativeScript/nativescript-cli

7dc8bdc

# Conflicts: # lib/services/android-plugin-build-service.ts # vendor/gradle-plugin/build.gradle

fix: kotlin version fix

2fa7722

feat: --gradle option to specify custom gradle binary

0b55d42

fix: pass gradlePath to plugin build

2128946

fix: rename gradle option to gradlePath

8d1eba9

chore: upgraded yargs and typescript

d00c7ac

feat: implemented --gradle option to pass gradle parameters

78e88eb

fix: correctly allow plugins build to detect before-plugins.gradle

e8e39b4

and other gradle scripts

chore: cleanup logs

ac53b20

Merge remote-tracking branch 'nativescript/main'

d25445b

cla-bot bot added the cla: yes label Dec 24, 2023

This was referenced Jan 17, 2024

feat: add --json option to ns config #5773

Closed

feat(android): allow to force gradle version throught nativescript-co… #5764

Closed

fix: handle gradleArgs as an array option #5636

Closed

fix: update plugin gradle script #5578

Open

NathanWalker added this to the 9.0 milestone Feb 2, 2024

farfromrefug added 2 commits February 16, 2024 21:12

fix(android): non eager namespace replace in manifest

a10c9b5

chore: another android gradle rule...

aa6f565

# Conflicts: # vendor/gradle-app/app/build.gradle

rigor789 requested changes Mar 13, 2024

View reviewed changes

farfromrefug and others added 9 commits March 13, 2024 15:56

Update lib/controllers/platform-controller.ts

b40cf83

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

Update lib/controllers/prepare-controller.ts

ecaaf44

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

Update lib/services/device/device-install-app-service.ts

2bbe084

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

chore: cleanup gradle task as it seems to work fine like this

6e1a227

chore: we push --stacktrace all the time now

dffe847

chore: testing

43c9d74

chore: review

45d518b

Merge remote-tracking branch 'origin/new_big_merge_test' into new_big…

e61d7aa

…_merge_test

chore: adress comments

c1b8326

farfromrefug and others added 4 commits March 13, 2024 21:21

Update lib/services/device/device-install-app-service.ts

e1d95dc

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

chore: rename flavor option to gradleFlavor

6aa3ea3

Merge remote-tracking branch 'nativescript/main' into new_big_merge_test

50792ea

# Conflicts: # lib/services/plugins-service.ts

chore: tests

806855c

chore: cleanup (mostly formatting)

c3db9c2

rigor789 requested changes Apr 2, 2024

View reviewed changes

rigor789 mentioned this pull request Apr 3, 2024

feat: new syncChangedDataOnDevices #5772

Closed

rigor789 removed this from the 9.0 milestone Apr 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: many new android features #5774

feat: many new android features #5774

farfromrefug commented Dec 24, 2023 •

edited

farfromrefug commented Mar 2, 2024

rigor789 left a comment

rigor789 Mar 13, 2024

farfromrefug Mar 13, 2024

farfromrefug commented Mar 13, 2024

farfromrefug commented Mar 14, 2024

rigor789 left a comment

rigor789 Apr 2, 2024

NathanWalker Apr 16, 2024

farfromrefug Apr 16, 2024

feat: many new android features #5774

Are you sure you want to change the base?

feat: many new android features #5774

Conversation

farfromrefug commented Dec 24, 2023 • edited

TODO

farfromrefug commented Mar 2, 2024

rigor789 left a comment

Choose a reason for hiding this comment

rigor789 Mar 13, 2024

Choose a reason for hiding this comment

farfromrefug Mar 13, 2024

Choose a reason for hiding this comment

farfromrefug commented Mar 13, 2024

farfromrefug commented Mar 14, 2024

rigor789 left a comment

Choose a reason for hiding this comment

rigor789 Apr 2, 2024

Choose a reason for hiding this comment

NathanWalker Apr 16, 2024

Choose a reason for hiding this comment

farfromrefug Apr 16, 2024

Choose a reason for hiding this comment

farfromrefug commented Dec 24, 2023 •

edited