Skip to content

Commit 278d4b5

Browse files
authored
Merge pull request #320 from matteodanelli/develop
chore(android): replaced jCenter with maven
2 parents b69e6c4 + f900c4a commit 278d4b5

File tree

9 files changed

+6645
-22
lines changed

9 files changed

+6645
-22
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ Linking the package manually is not required anymore with [Autolinking](https://
8181
```
8282
buildscript {
8383
ext {
84-
buildToolsVersion = "28.0.3"
85-
minSdkVersion = 16
86-
compileSdkVersion = 28
87-
targetSdkVersion = 28
84+
buildToolsVersion = "30.0.2"
85+
minSdkVersion = 21
86+
compileSdkVersion = 30
87+
targetSdkVersion = 30
88+
ndkVersion = "21.4.7075529"
8889
// Remove 'supportLibVersion' property and put specific versions for AndroidX libraries
8990
androidXAnnotation = "1.2.0"
9091
androidXBrowser = "1.3.0"
@@ -450,8 +451,8 @@ Using in-app browser tabs (like SFAuthenticationSession/ASWebAuthenticationSessi
450451
* **React Native Safari View:** [A React Native wrapper for Safari View Controller](https://github.com/naoufal/react-native-safari-view)
451452

452453
## Contributing ✨
453-
When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change.
454-
Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated** ❤️.
454+
When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change.
455+
Contributions are what make the open-source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated** ❤️.
455456
You can learn more about how you can contribute to this project in the [contribution guide](https://github.com/proyecto26/react-native-inappbrowser/blob/develop/CONTRIBUTING.md).
456457

457458
## Contributors ✨

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
if (project == rootProject) {
88
repositories {
99
maven { url "https://maven.google.com" }
10-
jcenter()
10+
mavenCentral()
1111
google()
1212
}
1313

example/android/app/build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
120120
*/
121121
def enableHermes = project.ext.react.get("enableHermes", false);
122122

123+
/**
124+
* Architectures to build native code for in debug.
125+
*/
126+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
127+
123128
android {
124129
ndkVersion rootProject.ext.ndkVersion
125130

@@ -156,6 +161,11 @@ android {
156161
buildTypes {
157162
debug {
158163
signingConfig signingConfigs.debug
164+
if (nativeArchitectures) {
165+
ndk {
166+
abiFilters nativeArchitectures.split(',')
167+
}
168+
}
159169
}
160170
release {
161171
// Caution! In production, you need to generate your own keystore file.
@@ -215,7 +225,7 @@ dependencies {
215225
// Run this once to be able to run the application with BUCK
216226
// puts all compile dependencies into folder libs for BUCK to use
217227
task copyDownloadableDepsToLibs(type: Copy) {
218-
from configurations.compile
228+
from configurations.implementation
219229
into 'libs'
220230
}
221231

example/android/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "29.0.3"
5+
buildToolsVersion = "30.0.2"
66
minSdkVersion = 21
7-
compileSdkVersion = 29
8-
targetSdkVersion = 29
9-
ndkVersion = "20.1.5948944"
7+
compileSdkVersion = 30
8+
targetSdkVersion = 30
9+
ndkVersion = "21.4.7075529"
10+
androidXAnnotation = "1.2.0"
11+
androidXBrowser = "1.3.0"
1012
}
1113
repositories {
1214
google()
13-
jcenter()
15+
mavenCentral()
1416
}
1517
dependencies {
16-
classpath("com.android.tools.build:gradle:4.1.0")
18+
classpath("com.android.tools.build:gradle:4.2.2")
1719
// NOTE: Do not place your application dependencies here; they belong
1820
// in the individual module build.gradle files
1921
}
2022
}
2123

2224
allprojects {
2325
repositories {
26+
mavenCentral()
2427
mavenLocal()
2528
maven {
2629
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -32,7 +35,7 @@ allprojects {
3235
}
3336

3437
google()
35-
jcenter()
38+
mavenCentral()
3639
maven { url 'https://www.jitpack.io' }
3740
}
3841
}

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.75.1
28+
FLIPPER_VERSION=0.101.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

example/ios/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
platform :ios, '10.0'
4+
platform :ios, '11.0'
55

66
target 'example' do
77
config = use_native_modules!
@@ -25,5 +25,6 @@ target 'example' do
2525

2626
post_install do |installer|
2727
react_native_post_install(installer)
28+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
2829
end
2930
end

example/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"clean:ios": "cd ios && pod cache clean --all;rm -rf ~/Library/Caches/CocoaPods; rm -rf Pods; rm -rf ~/Library/Developer/Xcode/DerivedData/*; pod deintegrate; pod setup; pod install;"
1515
},
1616
"dependencies": {
17-
"react": "17.0.1",
18-
"react-native": "0.64.2",
17+
"react": "17.0.2",
18+
"react-native": "0.66.4",
1919
"react-native-inappbrowser-reborn": "file:.."
2020
},
2121
"devDependencies": {
@@ -25,8 +25,8 @@
2525
"babel-jest": "^26.6.3",
2626
"eslint": "7.14.0",
2727
"jest": "^26.6.3",
28-
"metro-react-native-babel-preset": "^0.64.0",
29-
"react-test-renderer": "17.0.1"
28+
"metro-react-native-babel-preset": "^0.66.2",
29+
"react-test-renderer": "17.0.2"
3030
},
3131
"jest": {
3232
"preset": "react-native",

0 commit comments

Comments
 (0)