Skip to content

Commit 8378ef3

Browse files
Merge remote-tracking branch 'upstream/master' into feature/update-1.6.0
2 parents 2f2d5c3 + fbbe4a0 commit 8378ef3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1272
-2789
lines changed

android/app/build.gradle

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apply plugin: "com.facebook.react"
44

55
/** Add this Firebase intialize */
66
// apply plugin: 'com.google.gms.google-services'
7+
// apply plugin: 'com.google.firebase.crashlytics'
78

89
apply plugin: "kotlin-android"
910

@@ -78,7 +79,15 @@ def enableProguardInReleaseBuilds = false
7879
def jscFlavor = 'org.webkit:android-jsc:+'
7980

8081
android {
81-
ndkVersion rootProject.ext.ndkVersion
82+
83+
ndkVersion "21.4.7075529"
84+
// ndkVersion rootProject.ext.ndkVersion
85+
86+
externalNativeBuild {
87+
cmake {
88+
path 'jni/CMakeLists.txt'
89+
}
90+
}
8291
buildToolsVersion rootProject.ext.buildToolsVersion
8392
compileSdk rootProject.ext.compileSdkVersion
8493

@@ -88,7 +97,7 @@ android {
8897
minSdkVersion rootProject.ext.minSdkVersion
8998
targetSdkVersion rootProject.ext.targetSdkVersion
9099
versionCode 1
91-
versionName "3.0.16"
100+
versionName "3.2.7"
92101
/** Add this for react-native-camera */
93102
missingDimensionStrategy 'react-native-camera', 'general'
94103
multiDexEnabled true
@@ -115,6 +124,14 @@ android {
115124
}
116125
}
117126

127+
allprojects {
128+
repositories {
129+
google()
130+
mavenCentral()
131+
maven { url "https://repo.mirrorfly.com/snapshot" }
132+
}
133+
}
134+
118135
dependencies {
119136
// The version of react-native is set by the React Native Gradle Plugin
120137
implementation("com.facebook.react:react-android")
@@ -124,6 +141,16 @@ dependencies {
124141
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
125142
implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
126143

144+
configurations {
145+
all {
146+
exclude group: 'org.json', module: 'json'
147+
exclude group: 'xpp3', module: 'xpp3'
148+
}
149+
}
150+
implementation fileTree(include: ['*.jar'], dir: 'libs')
151+
152+
api 'com.mirrorfly.sdk:mirrorfly-utilities:0.0.1'
153+
127154
// exclude group:'com.squareup.okhttp3', module:'okhttp'
128155

129156
if (hermesEnabled.toBoolean()) {

android/app/src/main/java/com/mirrorfly_rn/MainApplication.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
1212
import com.facebook.react.modules.i18nmanager.I18nUtil
1313
import com.facebook.soloader.SoLoader
14+
import com.mirrorfly_rn.newfilecompression.systemlibLoader.NativeLoader
1415

1516
class MainApplication : Application(), ReactApplication {
1617

@@ -33,8 +34,18 @@ class MainApplication : Application(), ReactApplication {
3334
override val reactHost: ReactHost
3435
get() = getDefaultReactHost(applicationContext, reactNativeHost)
3536

37+
38+
companion object {
39+
private var instance: MainApplication? = null
40+
fun getInstance(): MainApplication? {
41+
return instance
42+
}
43+
}
44+
3645
override fun onCreate() {
3746
super.onCreate()
47+
instance = this
48+
NativeLoader.initNativeLibs(applicationContext)
3849
val sharedI18nUtilInstance = I18nUtil.instance
3950
sharedI18nUtilInstance.allowRTL(applicationContext, true)
4051
SoLoader.init(this, false)

0 commit comments

Comments
 (0)