diff --git a/android/build.gradle b/android/build.gradle
index 381c0cf..ff480ef 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -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
@@ -30,6 +17,7 @@ buildscript {
     if (project == rootProject) {
         repositories {
             google()
+            mavenCentral()
             jcenter()
         }
         dependencies {
@@ -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()
 }
 
@@ -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) {
@@ -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:+'
-//}
diff --git a/android/external/SpotifySDK b/android/external/SpotifySDK
index cf06a97..cfd6b68 160000
--- a/android/external/SpotifySDK
+++ b/android/external/SpotifySDK
@@ -1 +1 @@
-Subproject commit cf06a97e2a707fadf1f70e7e570145bad71476af
+Subproject commit cfd6b68a47440a7db8afac1983d92d324a1c0015
diff --git a/android/gradle.properties b/android/gradle.properties
deleted file mode 100644
index 2ea8f45..0000000
--- a/android/gradle.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-
-# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
\ No newline at end of file
diff --git a/ios/external/SpotifySDK b/ios/external/SpotifySDK
index cad6ba7..f9a7d53 160000
--- a/ios/external/SpotifySDK
+++ b/ios/external/SpotifySDK
@@ -1 +1 @@
-Subproject commit cad6ba74d5160bafa71ae9ea8d4e060bb0bf595c
+Subproject commit f9a7d53967de5ea633845c2387b7fc8f90b96265
diff --git a/react-native.config.js b/react-native.config.js
index 98c04a6..99baeff 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -1,9 +1,9 @@
 module.exports = {
-    dependency: {
-      platforms: {
-        android: {
-           "packageImportPath":"import com.reactlibrary.RNSpotifyRemotePackage;"
-        }, 
+  dependency: {
+    platforms: {
+      android: {
+        packageImportPath: "import com.reactlibrary.RNSpotifyRemotePackage;",
       },
-    }
-  };
\ No newline at end of file
+    },
+  },
+};