Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 14 additions & 76 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
// android/build.gradle

// based on:
//
// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
// original location:
// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/build.gradle
//
// * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
// original location:
// - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle

def DEFAULT_COMPILE_SDK_VERSION = 28
def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
def DEFAULT_COMPILE_SDK_VERSION = 29
def DEFAULT_MIN_SDK_VERSION = 16
def DEFAULT_TARGET_SDK_VERSION = 28
def DEFAULT_TARGET_SDK_VERSION = 29

def safeExtGet(prop, fallback) {
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
Expand All @@ -30,6 +17,7 @@ buildscript {
if (project == rootProject) {
repositories {
google()
mavenCentral()
jcenter()
}
dependencies {
Expand All @@ -43,34 +31,35 @@ apply plugin: 'maven'

android {
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
versionCode 1
versionName "1.0"
}

buildTypes {
release {
minifyEnabled false
}
}
lintOptions {
abortOnError false
disable 'GradleCompatible'
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

repositories {
// ref: https://www.baeldung.com/maven-local-repository
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()
mavenCentral()
jcenter()
}

Expand All @@ -83,7 +72,7 @@ dependencies {
implementation "com.google.code.gson:gson:2.8.5" // needed by spotify-app-remote
implementation project(path: ':react-native-events') // From node_module
//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+'
implementation "com.facebook.react:react-native:+" // From node_modules
}

def configureReactNativePom(def pom) {
Expand Down Expand Up @@ -158,54 +147,3 @@ afterEvaluate { project ->
}
}
}



//buildscript {
// repositories {
// google()
// jcenter()
// mavenCentral()
// }
//
// dependencies {
// classpath 'com.android.tools.build:gradle:3.6.1'
// }
//}
//
//apply plugin: 'com.android.library'
//
//android {
// compileSdkVersion 28
// buildToolsVersion "28.0.3"
//
// defaultConfig {
// minSdkVersion 16
// targetSdkVersion 28
// versionCode 1
// versionName "1.0"
// }
// lintOptions {
// abortOnError false
// }
// compileOptions {
// sourceCompatibility = 1.8
// targetCompatibility = 1.8
// }
//}
//
//repositories {
// google()
// maven {
// // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
// url "$rootDir/../node_modules/react-native/android"
// }
// jcenter()
//}
//
//dependencies {
// implementation project(':spotify-app-remote-release-0.7.0')
// implementation 'com.spotify.android:auth:1.2.3'
// implementation project(path: ':react-native-events')
// implementation 'com.facebook.react:react-native:+'
//}
2 changes: 1 addition & 1 deletion android/external/SpotifySDK
Submodule SpotifySDK updated 155 files
28 changes: 0 additions & 28 deletions android/gradle.properties

This file was deleted.

2 changes: 1 addition & 1 deletion ios/external/SpotifySDK
Submodule SpotifySDK updated 108 files
14 changes: 7 additions & 7 deletions react-native.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = {
dependency: {
platforms: {
android: {
"packageImportPath":"import com.reactlibrary.RNSpotifyRemotePackage;"
},
dependency: {
platforms: {
android: {
packageImportPath: "import com.reactlibrary.RNSpotifyRemotePackage;",
},
}
};
},
},
};