Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 87ef7b6

Browse files
Update react-native to 0.61.2
1 parent d74ec38 commit 87ef7b6

File tree

33 files changed

+12360
-561
lines changed

33 files changed

+12360
-561
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
*.pbxproj -text
1+
*.pbxproj -text

.gitignore

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
estimote-react-native-proximity-*.tgz
2-
example/package-lock.json
3-
Pods
4-
51
# OSX
62
#
73
.DS_Store
84

95
# Xcode
106
#
11-
build
7+
build/
128
*.pbxuser
139
!default.pbxuser
1410
*.mode1v3
@@ -28,22 +24,23 @@ project.xcworkspace
2824

2925
# Android/IntelliJ
3026
#
31-
build
27+
build/
3228
.idea
3329
.gradle
3430
local.properties
3531
*.iml
3632

3733
# node.js
3834
#
39-
node_modules
35+
node_modules/
4036
npm-debug.log
4137
yarn-error.log
4238

4339
# BUCK
44-
buck-out
45-
\.buckd
40+
buck-out/
41+
\.buckd/
4642
*.keystore
43+
!debug.keystore
4744

4845
# fastlane
4946
#
@@ -58,3 +55,5 @@ buck-out
5855

5956
# Bundle artifact
6057
*.jsbundle
58+
59+
*.tgz

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
example/

android/.npmignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
*.iml
2+
.DS_Store
3+
.gradle/
4+
.idea
5+
.npmignore
6+
build/
7+
gradle/
8+
gradlew
9+
gradlew.bat
10+
local.properties

android/build.gradle

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,53 @@
1+
def safeExtGet(prop, fallback) {
2+
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
3+
}
4+
15
buildscript {
2-
repositories {
3-
google()
4-
jcenter()
5-
}
6-
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.4.1'
6+
// The Android Gradle plugin is only required when opening the android folder stand-alone.
7+
// This avoids unnecessary downloads and potential conflicts when the library is included as a
8+
// module dependency in an application project.
9+
if (project == rootProject) {
10+
repositories {
11+
google()
12+
jcenter()
13+
}
14+
dependencies {
15+
classpath 'com.android.tools.build:gradle:3.5.1'
16+
}
817
}
918
}
1019

1120
apply plugin: 'com.android.library'
1221

1322
android {
14-
compileSdkVersion 28
15-
buildToolsVersion "28.0.3"
23+
compileSdkVersion safeExtGet('compileSdkVersion', 28)
24+
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
1625
defaultConfig {
17-
minSdkVersion 18
18-
targetSdkVersion 28
19-
versionCode 1
20-
versionName "1.0"
26+
minSdkVersion safeExtGet('minSdkVersion', 18)
27+
targetSdkVersion safeExtGet('targetSdkVersion', 28)
2128
}
2229
lintOptions {
2330
abortOnError false
2431
}
2532
}
2633

2734
repositories {
35+
mavenLocal()
36+
maven {
37+
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
38+
url "$rootDir/../node_modules/react-native/android"
39+
}
40+
maven {
41+
// Android JSC is installed from npm
42+
url "$rootDir/../node_modules/jsc-android/dist"
43+
}
44+
google()
2845
jcenter()
29-
maven { url 'https://maven.google.com' }
3046
}
3147

3248
dependencies {
33-
implementation 'com.facebook.react:react-native:+'
49+
//noinspection GradleDynamicVersion
50+
implementation "com.facebook.react:react-native:+" // From node_modules
3451
implementation 'com.estimote:proximity-sdk:1.0.3'
3552
implementation 'com.estimote:scanning-plugin:0.25.2'
3653
}
-53.4 KB
Binary file not shown.

android/gradle/wrapper/gradle-wrapper.properties

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

android/gradlew

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

android/gradlew.bat

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

0 commit comments

Comments
 (0)