Skip to content

Commit 53c8ca7

Browse files
VarniusViktoras Laukevičius
andauthored
Bump RN version to 0.81.4 (#185)
* bump RN version * fix Android build * make iOS work * debug build scripts * debug build scripts * debug build scripts * debug build scripts * debug build scripts * debug build scripts * debug build scripts * Specify signing config for example iOS app * add tests back * remove test triggers * return email client config for iOS * remove obsolete Kotlin version definition --------- Co-authored-by: Viktoras Laukevičius <[email protected]>
1 parent 1af0c83 commit 53c8ca7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+12322
-1173
lines changed

.github/workflows/build-android-apk.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ name: build-android-apk
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [master]
6+
branches:
7+
- '**'
78

89
jobs:
910
install-and-test:
@@ -17,7 +18,7 @@ jobs:
1718
rm -rf node_modules
1819
npm config set cache "$HOME/.npm-cache"
1920
npm cache clean --force
20-
npm install
21+
npm install --force
2122
2223
build:
2324
needs: install-and-test
@@ -31,7 +32,7 @@ jobs:
3132
rm -rf node_modules
3233
npm config set cache "$HOME/.npm-cache"
3334
npm cache clean --force
34-
npm install
35+
npm install --force
3536
3637
- name: Overwrite index.js
3738
run: |
@@ -59,18 +60,3 @@ jobs:
5960
with:
6061
name: apk-app-development-release
6162
path: example/android/app/build/outputs/apk/release/app-release.apk
62-
63-
- name: Upload app to browserstack
64-
run: |
65-
curl -u ${{ secrets.ARGYLE_MOBILE_RUN_BS_USER }}:${{ secrets.ARGYLE_MOBILE_RUN_BS_KEY }} -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@example/android/app/build/outputs/apk/release/app-release.apk" -F 'data={"custom_id": "android_react_latest"}'
66-
67-
trigger-auto-tests:
68-
permissions:
69-
contents: 'read'
70-
id-token: 'write'
71-
needs: build
72-
uses: argyle-systems/argyle-qa-mobile/.github/workflows/test_dev_rn_android.yaml@master
73-
secrets: inherit
74-
with:
75-
id: react_native_android_dev-build-and-deploy
76-

.github/workflows/build-ios-ipa.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ name: build-ios-ipa
33
on:
44
workflow_dispatch:
55
push:
6-
branches: [master]
6+
branches:
7+
- '**'
78

89
jobs:
910
build:
@@ -12,7 +13,7 @@ jobs:
1213
steps:
1314
- uses: maxim-lobanov/[email protected]
1415
with:
15-
xcode-version: '15.0'
16+
xcode-version: '26.0'
1617

1718
- uses: actions/[email protected]
1819

@@ -23,7 +24,7 @@ jobs:
2324
rm -rf node_modules
2425
npm config set cache "$HOME/.npm-cache"
2526
npm cache clean --force
26-
npm install
27+
npm install --force
2728
2829
- name: Overwrite index.js
2930
run: |
@@ -71,18 +72,3 @@ jobs:
7172
with:
7273
name: ipa-LinkReactNative
7374
path: example/ios/build-demo/LinkReactNative.ipa
74-
75-
- name: Upload app to browserstack
76-
run: |
77-
curl \
78-
-u ${{ secrets.ARGYLE_MOBILE_RUN_BS_USER }}:${{ secrets.ARGYLE_MOBILE_RUN_BS_KEY }} \
79-
-X POST "https://api-cloud.browserstack.com/app-automate/upload" \
80-
-F "file=@example/ios/build-demo/LinkReactNative.ipa" \
81-
-F 'data={"custom_id": "ios_react_latest"}'
82-
83-
trigger-auto-tests:
84-
needs: build
85-
uses: argyle-systems/argyle-qa-mobile/.github/workflows/test_dev_rn_ios.yaml@master
86-
secrets: inherit
87-
with:
88-
id: react_native_ios_dev-build-and-deploy

android/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ apply plugin: 'com.android.library'
2020
apply plugin: 'kotlin-android'
2121

2222
android {
23+
namespace = "com.reactlibrary"
2324
compileSdkVersion safeExtGet('compileSdkVersion')
2425

2526
defaultConfig {

android/gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
argyle_plugin_rn_kotlinVersion=2.0.21
1+
argyle_plugin_rn_kotlinVersion=2.2.20
22
argyle_plugin_rn_minSdkVersion=26
3-
argyle_plugin_rn_targetSdkVersion=35
4-
argyle_plugin_rn_compileSdkVersion=35
5-
argyle_plugin_rn_gradlePluginVersion=8.7.3
3+
argyle_plugin_rn_targetSdkVersion=36
4+
argyle_plugin_rn_compileSdkVersion=36
5+
argyle_plugin_rn_gradlePluginVersion=8.13.0
66
argyle_plugin_rn_reactnativeVersion=+
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.reactlibrary">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
</manifest>

android/src/main/java/com/reactlibrary/ARArgyleSdkModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class ARArgyleSdkModule(context: ReactApplicationContext) : ReactContextBaseJava
176176
}
177177
}
178178

179-
ArgyleLink.start(context = currentActivity as Context, config = nativeConfig)
179+
ArgyleLink.start(context = reactApplicationContext.currentActivity as Context, config = nativeConfig)
180180
}
181181

182182
@ReactMethod

example/.gitignore

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23-
ios/.xcode.env.local
23+
**/.xcode.env.local
2424

2525
# Android/IntelliJ
2626
#
@@ -33,6 +33,7 @@ local.properties
3333
.cxx/
3434
*.keystore
3535
!debug.keystore
36+
.kotlin/
3637

3738
# node.js
3839
#
@@ -56,11 +57,19 @@ yarn-error.log
5657
*.jsbundle
5758

5859
# Ruby / CocoaPods
59-
/ios/Pods/
60+
**/Pods/
6061
/vendor/bundle/
6162

6263
# Temporary files created by Metro to check the health of the file watcher
6364
.metro-health-check*
6465

6566
# testing
6667
/coverage
68+
69+
# Yarn
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions

example/.prettierrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
module.exports = {
22
arrowParens: 'avoid',
3-
bracketSameLine: true,
4-
bracketSpacing: false,
53
singleQuote: true,
64
trailingComma: 'all',
75
};

example/Gemfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,14 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
gem 'cocoapods', '~> 1.13'
7-
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'
11+
12+
# Ruby 3.4.0 has removed some libraries from the standard library.
13+
gem 'bigdecimal'
14+
gem 'logger'
15+
gem 'benchmark'
16+
gem 'mutex_m'

example/Gemfile.lock

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)