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

devDeps: [email protected]>~0.72.14 #29

Draft
wants to merge 43 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
8aed4cc
devDeps: [email protected]>~0.72.14
legobeat May 23, 2024
c185a65
yarn dedupe
legobeat May 28, 2024
e0d7360
updated lock file for ios example
sethkfman May 28, 2024
f113259
devDeps: [email protected]>~0.76.9
legobeat May 28, 2024
a7835c3
ci: update actions versions
legobeat May 28, 2024
96834b5
ci(android): java 11 -> 17
legobeat May 28, 2024
3efaae1
example: gradle 7.5.1 -> 8.3
legobeat May 28, 2024
ecd3f9b
chore: kotlin 1.6.0 -> 1.9.0
legobeat May 28, 2024
9f6004a
gradle 8.3
legobeat May 28, 2024
bcafdd2
kotlin 1.9.0
legobeat May 28, 2024
51ca6af
devDeps: react-native-test-app@^2.5.35->^3.7.3
sethkfman May 28, 2024
531610a
devDeps: [email protected]>0.72.21
legobeat May 28, 2024
6570bb4
fix: remove obsolete resolutions of @react-native-community/cli packages
legobeat May 28, 2024
2f22c93
ios: remove flipper config
legobeat May 28, 2024
3f079c5
example: remove hermes config from podfile
legobeat May 28, 2024
f5a2f1b
remove kotlin-stdlib setting
legobeat May 29, 2024
9674ef4
Revert "remove kotlin-stdlib setting"
legobeat May 29, 2024
2defbc0
fix(example): specify kotlin version
legobeat May 29, 2024
b70c67b
kotlin 1.9.20
legobeat May 29, 2024
1e5ec88
ci(macos): example app scheme
legobeat May 29, 2024
70e0cfc
revertme
legobeat May 29, 2024
e221b29
Revert "revertme"
legobeat May 29, 2024
3c9335a
ci(macos): example app scheme
legobeat May 29, 2024
5f6c537
fix(example): use_test_app
legobeat May 29, 2024
5f97753
Revert "ci(macos): example app scheme"
legobeat May 29, 2024
cac5bd1
chore: update example Podfiles
legobeat May 29, 2024
4591cad
Revert "ci(macos): example app scheme"
legobeat May 29, 2024
87f464c
fix: add missing devDependency @react-native-community/cli-platform-ios
legobeat May 29, 2024
272f3a4
chore: update example Podfiles
legobeat May 29, 2024
83e9c49
fix: downgrade kotlin from 1.9.20 to 1.7.1
leotm May 29, 2024
f81b2ac
Revert "fix: downgrade kotlin from 1.9.20 to 1.7.1"
leotm May 29, 2024
192b269
fix: stick to JDK 11 for RN 0.72
leotm May 29, 2024
d101647
fix: switch from temurin to zulu distro for RN 0.72
leotm May 29, 2024
c55c822
fix: downgrade kotlin from 1.9.20 to 1.7.1 (full)
leotm May 29, 2024
4fb769b
Revert "fix: downgrade kotlin from 1.9.20 to 1.7.1 (full)"
leotm May 29, 2024
f51d5b1
fix: downgrade kotlin from 1.9.20 to 1.7.10
leotm May 29, 2024
99ce6be
Revert "fix: downgrade kotlin from 1.9.20 to 1.7.10"
leotm May 29, 2024
d544fab
fix: downgrade gradle from 8.3.0 to 7.0.4
leotm May 29, 2024
2ebb89e
Revert "fix: downgrade gradle from 8.3.0 to 7.0.4"
leotm May 29, 2024
de0dfd8
fix: downgrade Gradle and AGP
leotm May 29, 2024
b04e7b2
fix: downgrade kotlin from 1.9.20 to 1.6.0
leotm May 29, 2024
35b216e
fix: android example app build
leotm May 29, 2024
cce2133
fix: android example app build
leotm May 29, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
distribution: zulu
java-version: 11
Comment on lines +25 to 26
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

best we stick to zulu@11 for RN 0.72
then introduce JDK 17 in RN 0.73
like upstream

- name: Install npm dependencies
run: yarn --frozen-lockfile
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/detox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ jobs:
name: 'Running tests'
runs-on: 'macOS-latest'
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
- name: Setup - Install Yarn
run: YARN_GPG=NO curl -o- -L https://yarnpkg.com/install.sh | bash
- name: Setup - Install NPM Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Node.js
uses: actions/setup-node@v2.5.1
uses: actions/setup-node@v4
with:
node-version: 20
- name: Cache /node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
cache: 'yarn'
- name: Install npm dependencies
run: yarn --frozen-lockfile
- name: Install macOS dependencies
Expand Down
13 changes: 3 additions & 10 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ apply plugin: 'kotlin-android'
android {
if (supportsNamespace()) {
namespace "com.reactnativecommunity.webview"
buildFeatures {
buildConfig true
}

sourceSets {
main {
Expand Down Expand Up @@ -105,13 +108,3 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
implementation "androidx.webkit:webkit:${safeExtGet('webkitVersion')}"
}

if (isNewArchitectureEnabled()) {
react {
jsRootDir = file("../src/")
libraryName = "rncwebview"
codegenJavaPackageName = "com.reactnativecommunity.webview"
codegenDir = new File(codegenPath)
reactNativeDir = new File(reactNativePath)
}
}
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ ReactNativeWebView_kotlinVersion=1.6.0
ReactNativeWebView_webkitVersion=1.4.0
ReactNativeWebView_compileSdkVersion=31
ReactNativeWebView_targetSdkVersion=31
ReactNativeWebView_minSdkVersion=21
ReactNativeWebView_minSdkVersion=21
2 changes: 1 addition & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ newArchEnabled=false
#ANDROID_NDK_VERSION=21.4.7075529

# Version of Kotlin to build against.
#KOTLIN_VERSION=1.7.10
# KOTLIN_VERSION=1.6.0
10 changes: 7 additions & 3 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ require_relative '../../node_modules/react-native-test-app/test_app'

workspace 'WebviewExample.xcworkspace'

# Comment out the line below to enable Flipper
use_flipper! false
options = {
:bridgeless_enabled => false,
# todo: read config from ci
:fabric_enabled => false,
:hermes_enabled => false,
}

use_test_app! :hermes_enabled => false
use_test_app! options
Loading
Loading