Skip to content

Commit 51dfe98

Browse files
wswebcreationwswebcreation
authored
Merge pull request #131 from webdriverio/upgrade
feat: upgrade to RN 0.73
2 parents 485ca19 + 0e89055 commit 51dfe98

File tree

113 files changed

+23106
-10826
lines changed

Some content is hidden

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

113 files changed

+23106
-10826
lines changed

‎.buckconfig

-6
This file was deleted.

‎.bundle/config

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUNDLE_PATH: "vendor/bundle"
2+
BUNDLE_FORCE_RUBY_PLATFORM: 1

‎.editorconfig

-9
This file was deleted.

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native-community',
3+
extends: '@react-native',
44
};

‎.gitattributes

-3
This file was deleted.

‎.github/workflows/publish.apps.yml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Build and Publish WebdriverIO Native Demo Apps
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
releaseType:
7+
description: 'Release type - major, minor or patch'
8+
required: true
9+
default: 'patch'
10+
11+
defaults:
12+
run:
13+
working-directory: android
14+
15+
jobs:
16+
ReleaseBuild:
17+
runs-on: macos-latest
18+
19+
strategy:
20+
fail-fast: true
21+
matrix:
22+
node-version: [20.x]
23+
java-version: [17.x]
24+
java-distribution: [zulu]
25+
26+
steps:
27+
- name: Check jq installation
28+
run: jq --version
29+
30+
- name: ⬇️ Checkout Repository
31+
uses: actions/checkout@v3
32+
33+
- name: 🌲 Setup Git
34+
run: |
35+
git config --global user.email "bot@webdriver.io"
36+
git config --global user.name "WebdriverIO Release Bot"
37+
38+
- name: ☕ Setup Java
39+
uses: actions/setup-java@v4
40+
with:
41+
distribution: ${{ matrix.java-distribution }}
42+
java-version: ${{ matrix.java-version }}
43+
44+
- name: 🤖 Setup Android SDK
45+
uses: android-actions/setup-android@v3
46+
47+
- name: 🟢 Setup Node.js ${{ matrix.node-version }}
48+
uses: actions/setup-node@v3
49+
with:
50+
node-version: ${{ matrix.node-version }}
51+
52+
- name: 🧩 Install Dependencies
53+
run: npm ci
54+
55+
- name: 🔍 Get current version from package.json
56+
run: echo "CURRENT_VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
57+
58+
- name: Calculate new version
59+
run: |
60+
IFS='.' read -ra VER <<< "$CURRENT_VERSION"
61+
if [ "${{ github.event.inputs.releaseType }}" == "major" ]; then
62+
let VER[0]++
63+
VER[1]=0
64+
VER[2]=0
65+
elif [ "${{ github.event.inputs.releaseType }}" == "minor" ]; then
66+
let VER[1]++
67+
VER[2]=0
68+
elif [ "${{ github.event.inputs.releaseType }}" == "patch" ]; then
69+
let VER[2]++
70+
fi
71+
NEW_VERSION="${VER[0]}.${VER[1]}.${VER[2]}"
72+
echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV

‎.gitignore

+17-10
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DerivedData
2020
*.hmap
2121
*.ipa
2222
*.xcuserstate
23+
ios/.xcode.env.local
2324

2425
# Android/IntelliJ
2526
#
@@ -28,33 +29,39 @@ build/
2829
.gradle
2930
local.properties
3031
*.iml
32+
*.hprof
33+
.cxx/
34+
*.keystore
35+
!debug.keystore
36+
!wdio-native-app-upload-key.keystore
3137

3238
# node.js
3339
#
3440
node_modules/
3541
npm-debug.log
3642
yarn-error.log
3743

38-
# BUCK
39-
buck-out/
40-
\.buckd/
41-
4244
# fastlane
4345
#
4446
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
4547
# screenshots whenever they are needed.
4648
# For more information about the recommended setup visit:
4749
# https://docs.fastlane.tools/best-practices/source-control/
4850

49-
*/fastlane/report.xml
50-
*/fastlane/Preview.html
51-
*/fastlane/screenshots
51+
**/fastlane/report.xml
52+
**/fastlane/Preview.html
53+
**/fastlane/screenshots
54+
**/fastlane/test_output
5255

5356
# Bundle artifact
5457
*.jsbundle
5558

56-
# CocoaPods
59+
# Ruby / CocoaPods
5760
/ios/Pods/
61+
/vendor/bundle/
62+
63+
# Temporary files created by Metro to check the health of the file watcher
64+
.metro-health-check*
5865

59-
# Extra
60-
package-lock.json
66+
# testing
67+
/coverage

‎.prettierrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
2+
arrowParens: 'avoid',
3+
bracketSameLine: true,
24
bracketSpacing: false,
3-
jsxBracketSameLine: true,
45
singleQuote: true,
56
trailingComma: 'all',
6-
arrowParens: 'avoid',
77
};

‎.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "interactive"
3+
}

‎.watchmanconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{}
1+
{}

‎Gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
3+
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4+
ruby ">= 2.6.10"
5+
6+
gem 'cocoapods', '~> 1.13'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

‎Gemfile.lock

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.6)
5+
rexml
6+
activesupport (6.1.7.6)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
12+
addressable (2.8.6)
13+
public_suffix (>= 2.0.2, < 6.0)
14+
algoliasearch (1.27.5)
15+
httpclient (~> 2.8, >= 2.8.3)
16+
json (>= 1.5.1)
17+
atomos (0.1.3)
18+
claide (1.1.0)
19+
cocoapods (1.14.3)
20+
addressable (~> 2.8)
21+
claide (>= 1.0.2, < 2.0)
22+
cocoapods-core (= 1.14.3)
23+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24+
cocoapods-downloader (>= 2.1, < 3.0)
25+
cocoapods-plugins (>= 1.0.0, < 2.0)
26+
cocoapods-search (>= 1.0.0, < 2.0)
27+
cocoapods-trunk (>= 1.6.0, < 2.0)
28+
cocoapods-try (>= 1.1.0, < 2.0)
29+
colored2 (~> 3.1)
30+
escape (~> 0.0.4)
31+
fourflusher (>= 2.3.0, < 3.0)
32+
gh_inspector (~> 1.0)
33+
molinillo (~> 0.8.0)
34+
nap (~> 1.0)
35+
ruby-macho (>= 2.3.0, < 3.0)
36+
xcodeproj (>= 1.23.0, < 2.0)
37+
cocoapods-core (1.14.3)
38+
activesupport (>= 5.0, < 8)
39+
addressable (~> 2.8)
40+
algoliasearch (~> 1.0)
41+
concurrent-ruby (~> 1.1)
42+
fuzzy_match (~> 2.0.4)
43+
nap (~> 1.0)
44+
netrc (~> 0.11)
45+
public_suffix (~> 4.0)
46+
typhoeus (~> 1.0)
47+
cocoapods-deintegrate (1.0.5)
48+
cocoapods-downloader (2.1)
49+
cocoapods-plugins (1.0.0)
50+
nap
51+
cocoapods-search (1.0.1)
52+
cocoapods-trunk (1.6.0)
53+
nap (>= 0.8, < 2.0)
54+
netrc (~> 0.11)
55+
cocoapods-try (1.2.0)
56+
colored2 (3.1.2)
57+
concurrent-ruby (1.2.2)
58+
escape (0.0.4)
59+
ethon (0.16.0)
60+
ffi (>= 1.15.0)
61+
ffi (1.16.3)
62+
fourflusher (2.3.1)
63+
fuzzy_match (2.0.4)
64+
gh_inspector (1.1.3)
65+
httpclient (2.8.3)
66+
i18n (1.14.1)
67+
concurrent-ruby (~> 1.0)
68+
json (2.7.1)
69+
minitest (5.20.0)
70+
molinillo (0.8.0)
71+
nanaimo (0.3.0)
72+
nap (1.1.0)
73+
netrc (0.11.0)
74+
public_suffix (4.0.7)
75+
rexml (3.2.6)
76+
ruby-macho (2.5.1)
77+
typhoeus (1.4.1)
78+
ethon (>= 0.9.0)
79+
tzinfo (2.0.6)
80+
concurrent-ruby (~> 1.0)
81+
xcodeproj (1.23.0)
82+
CFPropertyList (>= 2.3.3, < 4.0)
83+
atomos (~> 0.1.3)
84+
claide (>= 1.0.2, < 2.0)
85+
colored2 (~> 3.1)
86+
nanaimo (~> 0.3.0)
87+
rexml (~> 3.2.4)
88+
zeitwerk (2.6.12)
89+
90+
PLATFORMS
91+
ruby
92+
93+
DEPENDENCIES
94+
activesupport (>= 6.1.7.3, < 7.1.0)
95+
cocoapods (~> 1.13)
96+
97+
RUBY VERSION
98+
ruby 2.6.10p210
99+
100+
BUNDLED WITH
101+
1.17.2

‎README.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
# WebdriverIO Demo App for iOS and Android
22

3-
This app is build with React Native and will be used for test automation purposes for the
4-
[appium-boilerplate](https://github.com/webdriverio/appium-boilerplate).
3+
This app is built with React Native and will be used for test automation purposes for the [appium-boilerplate](https://github.com/webdriverio/appium-boilerplate).
54

65
https://user-images.githubusercontent.com/11979740/118520294-3fb8e480-b73a-11eb-9100-dccecbb683cc.mov
76

87
## Downloads
98
Different releases of the iOS and Android app can be downloaded [here](https://github.com/webdriverio/native-demo-app/releases)
109

11-
> **NOTE:**
12-
> The Android app can be installed on Android emulators and physical devices.
13-
> The iOS app can **ONLY** be installed on iOS simulators. There is no build available for physical iOS devices due to
14-
> not being able to install this app on physical iPhones. This is a (security) limitation from Apple.
10+
> [!NOTE]
11+
> The Android app can be installed on Android emulators and physical devices. The iOS app can **ONLY** be installed on iOS simulators. There is no build available for physical iOS devices due to not being able to install this app on physical iPhones. This is a (security) limitation from Apple.
1512
1613
## Features
1714
This app can/will be used for the [appium-boilerplate](https://github.com/webdriverio/appium-boilerplate) so (new) users

‎__tests__/App.test.tsx

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* @format
3+
*/
4+
5+
import 'react-native';
6+
import React from 'react';
7+
import App from '../src/App';
8+
9+
// Note: import explicitly to use the types shipped with jest.
10+
import {it} from '@jest/globals';
11+
12+
// Note: test renderer must be required after react-native.
13+
import renderer from 'react-test-renderer';
14+
15+
it('renders correctly', () => {
16+
renderer.create(<App />);
17+
});

‎android/app/_BUCK

-55
This file was deleted.

0 commit comments

Comments
 (0)