Skip to content

Commit

Permalink
Update and fix Gradle setup
Browse files Browse the repository at this point in the history
  • Loading branch information
friederbluemle committed Sep 18, 2019
1 parent 32b741c commit 6694f68
Show file tree
Hide file tree
Showing 9 changed files with 3,191 additions and 1,342 deletions.
19 changes: 9 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@

# OSX
#
.DS_Store

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


# Xcode
#
build/
Expand All @@ -29,7 +21,6 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace


# Android/IntelliJ
#
Expand All @@ -38,9 +29,17 @@ build/
.gradle
local.properties
*.iml
android/gradle/
android/gradlew
android/gradlew.bat

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

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

36 changes: 22 additions & 14 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ def safeExtGet(prop, fallback) {
}

buildscript {
repositories {
maven {
url 'https://maven.google.com/'
name 'Google'
// 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'
}
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion safeExtGet('compileSdkVersion', 27)
buildToolsVersion safeExtGet('buildToolsVersion', '28.0.2')

buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', 16)
targetSdkVersion safeExtGet('targetSdkVersion', 26)
Expand All @@ -37,14 +37,22 @@ 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 {
url 'https://maven.google.com/'
name 'Google'
// Android JSC is installed from npm
url "$rootDir/../node_modules/jsc-android/dist"
}
google()
jcenter()
}

dependencies {
implementation 'com.facebook.react:react-native:'+safeExtGet('reactNativeVersion', '+')
//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+' // From node_modules
implementation 'net.openid:appauth:0.7.1'
implementation 'androidx.browser:browser:1.0.0'
}
2 changes: 0 additions & 2 deletions android/gradle.properties

This file was deleted.

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.

160 changes: 0 additions & 160 deletions android/gradlew

This file was deleted.

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

This file was deleted.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"jest": "^21.2.1",
"lint-staged": "^6.1.0",
"prettier": "1.10.2",
"react": "^16.1.1",
"react-native": "^0.50.3"
"react": "16.8.6",
"react-native": "0.60.3"
},
"dependencies": {}
}
Loading

0 comments on commit 6694f68

Please sign in to comment.