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

Commit c4407e4

Browse files
Update react-native to 0.60.5
1 parent d74ec38 commit c4407e4

File tree

30 files changed

+12348
-722
lines changed

30 files changed

+12348
-722
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: 12 additions & 10 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
@@ -24,26 +20,27 @@ DerivedData
2420
*.hmap
2521
*.ipa
2622
*.xcuserstate
27-
project.xcworkspace
23+
xcshareddata
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,8 @@ buck-out
5855

5956
# Bundle artifact
6057
*.jsbundle
58+
59+
# CocoaPods
60+
/ios/Pods/
61+
62+
*.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: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
buildscript {
2+
ext.safeExtGet = {prop, fallback ->
3+
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
4+
}
25
repositories {
36
google()
47
jcenter()
58
}
69
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.4.1'
10+
classpath("com.android.tools.build:gradle:3.5.0")
811
}
912
}
1013

1114
apply plugin: 'com.android.library'
1215

16+
def DEFAULT_COMPILE_SDK_VERSION = 28
17+
def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
18+
def DEFAULT_MIN_SDK_VERSION = 18
19+
def DEFAULT_TARGET_SDK_VERSION = 28
20+
1321
android {
14-
compileSdkVersion 28
15-
buildToolsVersion "28.0.3"
22+
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
23+
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
1624
defaultConfig {
17-
minSdkVersion 18
18-
targetSdkVersion 28
25+
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
26+
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
1927
versionCode 1
2028
versionName "1.0"
2129
}
@@ -25,12 +33,23 @@ android {
2533
}
2634

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

3250
dependencies {
33-
implementation 'com.facebook.react:react-native:+'
51+
//noinspection GradleDynamicVersion
52+
implementation "com.facebook.react:react-native:+" // From node_modules
3453
implementation 'com.estimote:proximity-sdk:1.0.3'
3554
implementation 'com.estimote:scanning-plugin:0.25.2'
3655
}
-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.

0 commit comments

Comments
 (0)