Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(native-app): Android build fixes #17211

Merged
merged 9 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/native/app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"
apply plugin: 'com.google.gms.google-services'


// apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"

thoreyjona marked this conversation as resolved.
Show resolved Hide resolved
import com.android.build.OutputFile
Expand All @@ -16,11 +17,11 @@ react {
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node_modules/react-native")
reactNativeDir = file("../../../../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// codegenDir = file("../node_modules/@react-native/codegen")
codegenDir = file("../../../../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")
cliFile = file("../../../../../node_modules/react-native/cli.js")

/* Variants */
// The list of variants to that are debuggable. For those we're going to
Expand Down
4 changes: 2 additions & 2 deletions apps/native/app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ allprojects {
repositories {
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url("$rootDir/../node_modules/react-native/android")
url("$rootDir/../../../../../node_modules/react-native/android")
}
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
url("$rootDir/../../../../../node_modules/jsc-android/dist")
}
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
Expand Down
5 changes: 1 addition & 4 deletions apps/native/app/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ applyNativeModulesSettingsGradle(settings)
include ':app', ':react-native-code-push'
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../../../../node_modules/react-native-code-push/android/app')

include ':react-native-clipboard'
project(':react-native-clipboard').projectDir = new File(rootProject.projectDir, '../../node_modules/@react-native-clipboard/clipboard/android')

include ':app'
includeBuild('../node_modules/@react-native/gradle-plugin')
includeBuild('../../../../node_modules/@react-native/gradle-plugin')

apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
useExpoModules()
2 changes: 1 addition & 1 deletion apps/native/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"react-native-pdf": "6.7.5",
"react-native-quick-actions": "0.3.13",
"react-native-quick-base64": "2.1.2",
"react-native-reanimated": "3.12.1",
"react-native-reanimated": "3.16.5",
"react-native-share": "10.2.1",
"react-native-spotlight-search": "2.0.0",
"react-native-svg": "15.2.0",
Expand Down
2 changes: 1 addition & 1 deletion codemagic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ workflows:
- island-upload-keystore
groups:
- google_credentials
- firebase_credentials
- firebase_credentials_dev
vars:
<<: *shared_envs
PACKAGE_NAME: 'is.island.app.dev'
Expand Down
184 changes: 178 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2754,6 +2754,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-annotate-as-pure@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-annotate-as-pure@npm:7.25.9"
dependencies:
"@babel/types": ^7.25.9
checksum: 41edda10df1ae106a9b4fe617bf7c6df77db992992afd46192534f5cff29f9e49a303231733782dd65c5f9409714a529f215325569f14282046e9d3b7a1ffb6c
languageName: node
linkType: hard

"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.18.6":
version: 7.18.9
resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.18.9"
Expand Down Expand Up @@ -2954,6 +2963,23 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-create-class-features-plugin@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-create-class-features-plugin@npm:7.25.9"
dependencies:
"@babel/helper-annotate-as-pure": ^7.25.9
"@babel/helper-member-expression-to-functions": ^7.25.9
"@babel/helper-optimise-call-expression": ^7.25.9
"@babel/helper-replace-supers": ^7.25.9
"@babel/helper-skip-transparent-expression-wrappers": ^7.25.9
"@babel/traverse": ^7.25.9
semver: ^6.3.1
peerDependencies:
"@babel/core": ^7.0.0
checksum: 91dd5f203ed04568c70b052e2f26dfaac7c146447196c00b8ecbb6d3d2f3b517abadb985d3321a19d143adaed6fe17f7f79f8f50e0c20e9d8ad83e1027b42424
languageName: node
linkType: hard

"@babel/helper-create-regexp-features-plugin@npm:^7.16.7, @babel/helper-create-regexp-features-plugin@npm:^7.17.12":
version: 7.17.12
resolution: "@babel/helper-create-regexp-features-plugin@npm:7.17.12"
Expand Down Expand Up @@ -3017,6 +3043,19 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-create-regexp-features-plugin@npm:^7.25.9":
version: 7.26.3
resolution: "@babel/helper-create-regexp-features-plugin@npm:7.26.3"
dependencies:
"@babel/helper-annotate-as-pure": ^7.25.9
regexpu-core: ^6.2.0
semver: ^6.3.1
peerDependencies:
"@babel/core": ^7.0.0
checksum: 50a27d8ce6da5c2fa0c62c132c4d27cfeb36e3233ff1e5220d643de3dafe49423b507382f0b72a696fce7486014b134c1e742f55438590f9405d26765b009af0
languageName: node
linkType: hard

"@babel/helper-define-polyfill-provider@npm:^0.3.3":
version: 0.3.3
resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3"
Expand Down Expand Up @@ -3258,6 +3297,16 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-member-expression-to-functions@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-member-expression-to-functions@npm:7.25.9"
dependencies:
"@babel/traverse": ^7.25.9
"@babel/types": ^7.25.9
checksum: 8e2f1979b6d596ac2a8cbf17f2cf709180fefc274ac3331408b48203fe19134ed87800774ef18838d0275c3965130bae22980d90caed756b7493631d4b2cf961
languageName: node
linkType: hard

"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-module-imports@npm:7.18.6"
Expand Down Expand Up @@ -3452,6 +3501,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-optimise-call-expression@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-optimise-call-expression@npm:7.25.9"
dependencies:
"@babel/types": ^7.25.9
checksum: f09d0ad60c0715b9a60c31841b3246b47d67650c512ce85bbe24a3124f1a4d66377df793af393273bc6e1015b0a9c799626c48e53747581c1582b99167cc65dc
languageName: node
linkType: hard

"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.17.12, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
version: 7.19.0
resolution: "@babel/helper-plugin-utils@npm:7.19.0"
Expand Down Expand Up @@ -3494,6 +3552,13 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-plugin-utils@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-plugin-utils@npm:7.25.9"
checksum: e19ec8acf0b696756e6d84531f532c5fe508dce57aa68c75572a77798bd04587a844a9a6c8ea7d62d673e21fdc174d091c9097fb29aea1c1b49f9c6eaa80f022
languageName: node
linkType: hard

"@babel/helper-remap-async-to-generator@npm:^7.18.9":
version: 7.18.9
resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9"
Expand Down Expand Up @@ -3627,6 +3692,19 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-replace-supers@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-replace-supers@npm:7.25.9"
dependencies:
"@babel/helper-member-expression-to-functions": ^7.25.9
"@babel/helper-optimise-call-expression": ^7.25.9
"@babel/traverse": ^7.25.9
peerDependencies:
"@babel/core": ^7.0.0
checksum: 84f40e12520b7023e52d289bf9d569a06284879fe23bbbacad86bec5d978b2669769f11b073fcfeb1567d8c547168323005fda88607a4681ecaeb4a5cdd48bb9
languageName: node
linkType: hard

"@babel/helper-simple-access@npm:^7.18.2, @babel/helper-simple-access@npm:^7.18.6":
version: 7.19.4
resolution: "@babel/helper-simple-access@npm:7.19.4"
Expand Down Expand Up @@ -3710,6 +3788,16 @@ __metadata:
languageName: node
linkType: hard

"@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9":
version: 7.25.9
resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9"
dependencies:
"@babel/traverse": ^7.25.9
"@babel/types": ^7.25.9
checksum: fdbb5248932198bc26daa6abf0d2ac42cab9c2dbb75b7e9f40d425c8f28f09620b886d40e7f9e4e08ffc7aaa2cefe6fc2c44be7c20e81f7526634702fb615bdc
languageName: node
linkType: hard

"@babel/helper-split-export-declaration@npm:^7.16.7, @babel/helper-split-export-declaration@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/helper-split-export-declaration@npm:7.18.6"
Expand Down Expand Up @@ -5153,6 +5241,18 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-class-properties@npm:^7.0.0-0":
version: 7.25.9
resolution: "@babel/plugin-transform-class-properties@npm:7.25.9"
dependencies:
"@babel/helper-create-class-features-plugin": ^7.25.9
"@babel/helper-plugin-utils": ^7.25.9
peerDependencies:
"@babel/core": ^7.0.0-0
checksum: a8d69e2c285486b63f49193cbcf7a15e1d3a5f632c1c07d7a97f65306df7f554b30270b7378dde143f8b557d1f8f6336c643377943dec8ec405e4cd11e90b9ea
languageName: node
linkType: hard

"@babel/plugin-transform-class-properties@npm:^7.22.3":
version: 7.22.3
resolution: "@babel/plugin-transform-class-properties@npm:7.22.3"
Expand Down Expand Up @@ -5234,6 +5334,22 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-classes@npm:^7.0.0-0":
version: 7.25.9
resolution: "@babel/plugin-transform-classes@npm:7.25.9"
dependencies:
"@babel/helper-annotate-as-pure": ^7.25.9
"@babel/helper-compilation-targets": ^7.25.9
"@babel/helper-plugin-utils": ^7.25.9
"@babel/helper-replace-supers": ^7.25.9
"@babel/traverse": ^7.25.9
globals: ^11.1.0
peerDependencies:
"@babel/core": ^7.0.0-0
checksum: d12584f72125314cc0fa8c77586ece2888d677788ac75f7393f5da574dfe4e45a556f7e3488fab29c8777ab3e5856d7a2d79f6df02834083aaa9d766440e3c68
languageName: node
linkType: hard

"@babel/plugin-transform-classes@npm:^7.21.0":
version: 7.21.0
resolution: "@babel/plugin-transform-classes@npm:7.21.0"
Expand Down Expand Up @@ -7372,6 +7488,18 @@ __metadata:
languageName: node
linkType: hard

"@babel/plugin-transform-unicode-regex@npm:^7.0.0-0":
version: 7.25.9
resolution: "@babel/plugin-transform-unicode-regex@npm:7.25.9"
dependencies:
"@babel/helper-create-regexp-features-plugin": ^7.25.9
"@babel/helper-plugin-utils": ^7.25.9
peerDependencies:
"@babel/core": ^7.0.0-0
checksum: e8baae867526e179467c6ef5280d70390fa7388f8763a19a27c21302dd59b121032568be080749514b097097ceb9af716bf4b90638f1b3cf689aa837ba20150f
languageName: node
linkType: hard

"@babel/plugin-transform-unicode-regex@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
Expand Down Expand Up @@ -13522,7 +13650,7 @@ __metadata:
react-native-pdf: 6.7.5
react-native-quick-actions: 0.3.13
react-native-quick-base64: 2.1.2
react-native-reanimated: 3.12.1
react-native-reanimated: 3.16.5
react-native-share: 10.2.1
react-native-spotlight-search: 2.0.0
react-native-svg: 15.2.0
Expand Down Expand Up @@ -40842,7 +40970,7 @@ __metadata:
languageName: node
linkType: hard

"jsesc@npm:^3.0.2":
"jsesc@npm:^3.0.2, jsesc@npm:~3.0.2":
version: 3.0.2
resolution: "jsesc@npm:3.0.2"
bin:
Expand Down Expand Up @@ -49993,23 +50121,26 @@ __metadata:
languageName: node
linkType: hard

"react-native-reanimated@npm:3.12.1":
version: 3.12.1
resolution: "react-native-reanimated@npm:3.12.1"
"react-native-reanimated@npm:3.16.5":
version: 3.16.5
resolution: "react-native-reanimated@npm:3.16.5"
dependencies:
"@babel/plugin-transform-arrow-functions": ^7.0.0-0
"@babel/plugin-transform-class-properties": ^7.0.0-0
"@babel/plugin-transform-classes": ^7.0.0-0
"@babel/plugin-transform-nullish-coalescing-operator": ^7.0.0-0
"@babel/plugin-transform-optional-chaining": ^7.0.0-0
"@babel/plugin-transform-shorthand-properties": ^7.0.0-0
"@babel/plugin-transform-template-literals": ^7.0.0-0
"@babel/plugin-transform-unicode-regex": ^7.0.0-0
"@babel/preset-typescript": ^7.16.7
convert-source-map: ^2.0.0
invariant: ^2.2.4
peerDependencies:
"@babel/core": ^7.0.0-0
react: "*"
react-native: "*"
checksum: 91575b3a20a5878f42d0302cf304ed46ff35c12ce717018c0bfb6af047bf675f224ab95de778daae483b139e66c5290a661635c06304065879b02a5926243e1c
checksum: 29d28dcf99acb2e3928963106a2860d15c9929712832d8d8437fb563691d0199884a63e925548fe5e4b6fc7a9008eadec3e0294b521d9466c875caf16de9c303
languageName: node
linkType: hard

Expand Down Expand Up @@ -51053,6 +51184,15 @@ __metadata:
languageName: node
linkType: hard

"regenerate-unicode-properties@npm:^10.2.0":
version: 10.2.0
resolution: "regenerate-unicode-properties@npm:10.2.0"
dependencies:
regenerate: ^1.4.2
checksum: d5c5fc13f8b8d7e16e791637a4bfef741f8d70e267d51845ee7d5404a32fa14c75b181c4efba33e4bff8b0000a2f13e9773593713dfe5b66597df4259275ce63
languageName: node
linkType: hard

"regenerate@npm:^1.4.2":
version: 1.4.2
resolution: "regenerate@npm:1.4.2"
Expand Down Expand Up @@ -51175,13 +51315,45 @@ __metadata:
languageName: node
linkType: hard

"regexpu-core@npm:^6.2.0":
version: 6.2.0
resolution: "regexpu-core@npm:6.2.0"
dependencies:
regenerate: ^1.4.2
regenerate-unicode-properties: ^10.2.0
regjsgen: ^0.8.0
regjsparser: ^0.12.0
unicode-match-property-ecmascript: ^2.0.0
unicode-match-property-value-ecmascript: ^2.1.0
checksum: 67d3c4a3f6c99bc80b5d690074a27e6f675be1c1739f8a9acf028fbc36f1a468472574ea65e331e217995198ba4404d7878f3cb3739a73552dd3c70d3fb7f8e6
languageName: node
linkType: hard

"regjsgen@npm:^0.6.0":
version: 0.6.0
resolution: "regjsgen@npm:0.6.0"
checksum: c5158ebd735e75074e41292ade1ff05d85566d205426cc61501e360c450a63baced8512ee3ae238e5c0a0e42969563c7875b08fa69d6f0402daf36bcb3e4d348
languageName: node
linkType: hard

"regjsgen@npm:^0.8.0":
version: 0.8.0
resolution: "regjsgen@npm:0.8.0"
checksum: a1d925ff14a4b2be774e45775ee6b33b256f89c42d480e6d85152d2133f18bd3d6af662161b226fa57466f7efec367eaf7ccd2a58c0ec2a1306667ba2ad07b0d
languageName: node
linkType: hard

"regjsparser@npm:^0.12.0":
version: 0.12.0
resolution: "regjsparser@npm:0.12.0"
dependencies:
jsesc: ~3.0.2
bin:
regjsparser: bin/parser
checksum: 094b55b0ab3e1fd58f8ce5132a1d44dab08d91f7b0eea4132b0157b303ebb8ded20a9cbd893d25402d2aeddb23fac1f428ab4947b295d6fa51dd1c334a9e76f0
languageName: node
linkType: hard

"regjsparser@npm:^0.8.2":
version: 0.8.4
resolution: "regjsparser@npm:0.8.4"
Expand Down
Loading