Merge pull request #8 from ConnectedHomes/fix/CNTBG-111/android-33-ch…

…anges Fixed the Build Gradle for upgrading the Android SDK
ConnectedHomes · Oct 7, 2023 · 4d3cdd5 · 4d3cdd5
2 parents 093a189 + 59f2581
commit 4d3cdd5
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 8 deletions.
diff --git a/android/.gradle/7.4.2/checksums/checksums.lock b/android/.gradle/7.4.2/checksums/checksums.lock
diff --git a/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock
diff --git a/android/.gradle/7.4.2/dependencies-accessors/gc.properties b/android/.gradle/7.4.2/dependencies-accessors/gc.properties
diff --git a/android/.gradle/7.4.2/fileChanges/last-build.bin b/android/.gradle/7.4.2/fileChanges/last-build.bin
diff --git a/android/.gradle/7.4.2/fileHashes/fileHashes.lock b/android/.gradle/7.4.2/fileHashes/fileHashes.lock
diff --git a/android/.gradle/7.4.2/gc.properties b/android/.gradle/7.4.2/gc.properties
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Fri Sep 29 12:51:28 BST 2023
+gradle.version=7.4.2
diff --git a/android/.gradle/vcs-1/gc.properties b/android/.gradle/vcs-1/gc.properties
diff --git a/android/build.gradle b/android/build.gradle
@@ -19,8 +19,9 @@ android {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:+'
-    compile 'com.google.android.gms:play-services-wallet:11.4.2'
-    compile 'com.android.support:support-v4:24.1.1'
-    compile 'com.android.support:appcompat-v7:24.1.1'
+    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.google.android.gms:play-services-wallet:11.4.2'
+    implementation 'com.android.support:support-v4:24.1.1'
+    implementation 'com.android.support:appcompat-v7:24.1.1'
+    implementation "androidx.annotation:annotation:1.1.0"
 }
diff --git a/android/src/main/java/com/reactnativepayments/ReactNativePaymentsModule.java b/android/src/main/java/com/reactnativepayments/ReactNativePaymentsModule.java
@@ -5,11 +5,11 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
 import android.util.Log;
 
 import com.facebook.react.bridge.Callback;

diff --git a/examples/native/android/gradle.properties b/examples/native/android/gradle.properties
@@ -18,3 +18,5 @@
 # org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/package.json b/package.json
@@ -7,7 +7,8 @@
     "run:ios": "cd examples/native && yarn run:ios",
     "run:web": "cd examples/web && yarn run:web",
     "run:demo": "cd examples/native && yarn run:demo",
-    "test": "jest"
+    "test": "jest",
+    "postinstall": "jetify"
   },
   "repository": "https://github.com/naoufal/react-native-payments",
   "keywords": [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Fri Sep 29 12:51:28 BST 2023
		gradle.version=7.4.2