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

Commit

Permalink
Update react-native to 0.60.5
Browse files Browse the repository at this point in the history
  • Loading branch information
friederbluemle committed Aug 22, 2019
1 parent 68d83e2 commit f989f59
Show file tree
Hide file tree
Showing 26 changed files with 12,407 additions and 461 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.pbxproj -text
*.pbxproj -text
20 changes: 11 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
estimote-react-native-proximity-*.tgz
example/package-lock.json
Pods

# OSX
#
.DS_Store

# Xcode
#
build
build/
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -28,22 +24,23 @@ project.xcworkspace

# Android/IntelliJ
#
build
build/
.idea
.gradle
local.properties
*.iml

# node.js
#
node_modules
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out
\.buckd
buck-out/
\.buckd/
*.keystore
!debug.keystore

# fastlane
#
Expand All @@ -58,3 +55,8 @@ buck-out

# Bundle artifact
*.jsbundle

# CocoaPods
/ios/Pods/

*.tgz
11 changes: 11 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node_modules/
build
.idea
.gradle/
gradlew
gradlew.bat
gradle/
local.properties
*.iml
npm-debug.log
example/
33 changes: 26 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
buildscript {
ext.safeExtGet = {prop, fallback ->
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath("com.android.tools.build:gradle:3.5.0")
}
}

apply plugin: 'com.android.library'

def DEFAULT_COMPILE_SDK_VERSION = 28
def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
def DEFAULT_MIN_SDK_VERSION = 18
def DEFAULT_TARGET_SDK_VERSION = 28

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
defaultConfig {
minSdkVersion 18
targetSdkVersion 28
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
versionCode 1
versionName "1.0"
}
Expand All @@ -25,12 +33,23 @@ android {
}

repositories {
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url("$rootDir/../node_modules/react-native/android")
}
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}

google()
jcenter()
maven { url 'https://maven.google.com' }
}

dependencies {
implementation 'com.facebook.react:react-native:+'
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
implementation 'com.estimote:proximity-sdk:1.0.3'
implementation 'com.estimote:scanning-plugin:0.25.2'
}
Binary file removed android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions android/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

172 changes: 0 additions & 172 deletions android/gradlew

This file was deleted.

84 changes: 0 additions & 84 deletions android/gradlew.bat

This file was deleted.

Loading

0 comments on commit f989f59

Please sign in to comment.