Skip to content

Commit 7b6307f

Browse files
committed
Merged in release/15.0.0 (pull request #54)
Release/15.0.0
2 parents c069972 + 9b0bd43 commit 7b6307f

65 files changed

Lines changed: 9705 additions & 6084 deletions

Some content is hidden

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

.editorconfig

Lines changed: 3 additions & 677 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ local.properties
4040
buck-out/
4141
\.buckd/
4242
*.keystore
43+
*.hprof

android/build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import groovy.json.JsonSlurper
2+
13
// android/build.gradle
24

35
// based on:
@@ -10,10 +12,10 @@
1012
// original location:
1113
// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
1214

13-
def DEFAULT_COMPILE_SDK_VERSION = 29
14-
def DEFAULT_BUILD_TOOLS_VERSION = '29.0.3'
15+
def DEFAULT_COMPILE_SDK_VERSION = 30
16+
def DEFAULT_BUILD_TOOLS_VERSION = '30.0.3'
1517
def DEFAULT_MIN_SDK_VERSION = 21
16-
def DEFAULT_TARGET_SDK_VERSION = 29
18+
def DEFAULT_TARGET_SDK_VERSION = 30
1719

1820
def safeExtGet(prop, fallback) {
1921
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -30,18 +32,16 @@ buildscript {
3032
if (project == rootProject) {
3133
repositories {
3234
google()
33-
jcenter()
3435
}
3536
dependencies {
36-
classpath 'com.android.tools.build:gradle:3.4.1'
37+
classpath 'com.android.tools.build:gradle:4.2.2'
3738
}
3839
}
3940
}
4041

4142
rootProject.allprojects {
4243
repositories {
4344
mavenCentral()
44-
maven { url 'https://s01.oss.sonatype.org/content/repositories/releases/' }
4545
}
4646
}
4747

@@ -74,17 +74,16 @@ repositories {
7474
url "$rootDir/../node_modules/jsc-android/dist"
7575
}
7676
google()
77-
jcenter()
7877
}
7978

8079
dependencies {
8180
//noinspection GradleDynamicVersion
8281
implementation 'com.facebook.react:react-native:+' // From node_modules
83-
api "$System.env.ANDROID_DEPENDENCY:14.1.+"
82+
api "$System.env.ANDROID_DEPENDENCY:15.0.+"
8483
}
8584

8685
def configureReactNativePom(def pom) {
87-
def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
86+
def packageJson = new JsonSlurper().parseText(file('../package.json').text)
8887
pom.project {
8988
name packageJson.title
9089
artifactId packageJson.name

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

android/gradlew

Lines changed: 33 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/gradlew.bat

Lines changed: 89 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)