Skip to content

Commit f6696d8

Browse files
authored
Merge pull request #142 from syscoin/fix/firebase-sdk
fix: firebase sdk version
2 parents 17a91bd + 58ba619 commit f6696d8

File tree

7 files changed

+102
-158
lines changed

7 files changed

+102
-158
lines changed

app/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
minSdkVersion = 21
99
compileSdkVersion = 33
1010
targetSdkVersion = 33
11-
kotlin_version = "1.3.50"
11+
kotlin_version = "1.9.20"
1212
kotlinVersion = "$kotlin_version"
1313
}
1414
repositories {
@@ -19,7 +19,7 @@ buildscript {
1919
}
2020

2121
dependencies {
22-
classpath('com.android.tools.build:gradle:4.2.2')
22+
classpath('com.android.tools.build:gradle:7.0.0-rc01')
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2424
classpath('com.google.gms:google-services:4.3.3')
2525
}

app/ios/PaliWallet.xcodeproj/project.pbxproj

Lines changed: 23 additions & 1 deletion
Large diffs are not rendered by default.

app/ios/Podfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ target 'PaliWallet' do
4747
# you should disable these next few lines.
4848

4949
end
50-
50+
pod 'FirebaseCore', :modular_headers => true
51+
pod 'GoogleUtilities', :modular_headers => true
52+
5153
pod 'RNCharts', :path => '../node_modules/react-native-charts-wrapper'
5254
pod 'CryptoSwift', '~> 1.0'
5355
pod 'react-native-theme-switch-animation', :path => '../node_modules/react-native-theme-switch-animation'

app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
"@react-native-community/push-notification-ios": "^1.10.1",
6969
"@react-native-community/slider": "^3.0.3",
7070
"@react-native-cookies/cookies": "^6.2.1",
71-
"@react-native-firebase/analytics": "^14.0.0",
72-
"@react-native-firebase/app": "^14.0.0",
73-
"@react-native-firebase/messaging": "^14.0.0",
71+
"@react-native-firebase/analytics": "19.2.0",
72+
"@react-native-firebase/app": "19.2.0",
73+
"@react-native-firebase/messaging": "19.2.0",
7474
"@rnhooks/keyboard": "^0.0.3",
7575
"@tradle/react-native-http": "2.0.1",
7676
"@walletconnect/core": "2.10.1",
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
diff --git a/node_modules/react-native-9patch-image/android/build.gradle b/node_modules/react-native-9patch-image/android/build.gradle
2+
index 28ce2d1..e3cf176 100644
3+
--- a/node_modules/react-native-9patch-image/android/build.gradle
4+
+++ b/node_modules/react-native-9patch-image/android/build.gradle
5+
@@ -26,7 +26,7 @@ android {
6+
}
7+
8+
dependencies {
9+
- compile 'com.facebook.react:react-native:+'
10+
+ implementation 'com.facebook.react:react-native:+'
11+
}
12+
13+
repositories {
14+
diff --git a/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCache.java b/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCache.java
15+
index 95cde1c..5681803 100644
16+
--- a/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCache.java
17+
+++ b/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCache.java
18+
@@ -1,7 +1,7 @@
19+
package su.rusfearuth.reactnative.native9patch;
20+
21+
-import android.support.annotation.NonNull;
22+
-import android.support.annotation.Nullable;
23+
+import androidx.annotation.NonNull;
24+
+import androidx.annotation.Nullable;
25+
26+
import java.lang.ref.WeakReference;
27+
import java.util.HashMap;
28+
diff --git a/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCapInsetView.java b/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCapInsetView.java
29+
index 2adca36..f07fe4c 100644
30+
--- a/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCapInsetView.java
31+
+++ b/node_modules/react-native-9patch-image/android/src/main/java/su/rusfearuth/reactnative/native9patch/RCTImageCapInsetView.java
32+
@@ -1,7 +1,7 @@
33+
package su.rusfearuth.reactnative.native9patch;
34+
35+
import android.content.Context;
36+
-import android.support.annotation.NonNull;
37+
+import androidx.annotation.NonNull;
38+
import android.widget.ImageView;
39+
40+
import su.rusfearuth.reactnative.native9patch.RCTImageCache;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff --git a/node_modules/react-native-os/android/build.gradle b/node_modules/react-native-os/android/build.gradle
2+
index 7055b60..53304fd 100644
3+
--- a/node_modules/react-native-os/android/build.gradle
4+
+++ b/node_modules/react-native-os/android/build.gradle
5+
@@ -44,5 +44,5 @@ repositories {
6+
}
7+
8+
dependencies {
9+
- compile 'com.facebook.react:react-native:+'
10+
+ implementation 'com.facebook.react:react-native:+'
11+
}

0 commit comments

Comments
 (0)