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.61.1
Browse files Browse the repository at this point in the history
  • Loading branch information
friederbluemle committed Sep 25, 2019
1 parent d74ec38 commit fd89260
Show file tree
Hide file tree
Showing 33 changed files with 12,432 additions and 561 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.pbxproj -text
*.pbxproj -text
17 changes: 8 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,5 @@ buck-out

# Bundle artifact
*.jsbundle

*.tgz
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
example/
10 changes: 10 additions & 0 deletions android/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
*.iml
.DS_Store
.gradle/
.idea
.npmignore
build/
gradle/
gradlew
gradlew.bat
local.properties
45 changes: 31 additions & 14 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,36 +1,53 @@
def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
}

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
// The Android Gradle plugin is only required when opening the android folder stand-alone.
// This avoids unnecessary downloads and potential conflicts when the library is included as a
// module dependency in an application project.
if (project == rootProject) {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
}
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion safeExtGet('compileSdkVersion', 28)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
defaultConfig {
minSdkVersion 18
targetSdkVersion 28
versionCode 1
versionName "1.0"
minSdkVersion safeExtGet('minSdkVersion', 18)
targetSdkVersion safeExtGet('targetSdkVersion', 28)
}
lintOptions {
abortOnError false
}
}

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 fd89260

Please sign in to comment.