Merge pull request #7 from 23mf/dev-androidx

Example support Androidx
23mf · Dec 27, 2019 · dc39556 · dc39556
2 parents be7977b + 842769c
commit dc39556
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Example/android/app/build.gradle b/Example/android/app/build.gradle
@@ -140,7 +140,10 @@ android {
 dependencies {
     implementation project(':react-native-translucent-modal')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    // fix bug: java.lang.NoClassDefFoundError: com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
+    // when app start
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
     implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 

diff --git a/Example/android/gradle.properties b/Example/android/gradle.properties
@@ -16,3 +16,5 @@
 # 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
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/Example/package.json b/Example/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "16.8.3",
     "react-native": "0.59.9",
-    "react-native-translucent-modal": "^1.0.3"
+    "react-native-translucent-modal": "file:../"
   },
   "devDependencies": {
     "@babel/core": "^7.4.5",

diff --git a/Example/yarn.lock b/Example/yarn.lock
@@ -4858,10 +4858,8 @@ react-is@^16.8.1, react-is@^16.8.3, react-is@^16.8.4:
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-react-native-translucent-modal@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/react-native-translucent-modal/-/react-native-translucent-modal-1.0.3.tgz#7ee581bcd3ca3c4ee9f5088dfd6452c6d985ce7c"
-  integrity sha512-qoQFK0rmRv+4m123YcoR3VlUcgvJPKQmZei+CbXF0PvHYuZ/YVqAyLscWpcfHd7XgF6pfOmXfdUDls0Zg//OuQ==
+"react-native-translucent-modal@file:..":
+  version "1.1.0"
 
 react-native@0.59.9:
   version "0.59.9"