SevicheCC/timepill-app
1
0
Fork 0
mirror of https://github.com/timepill/timepill-app.git synced 2025-04-30 09:59:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

android 暂时去除 react-native-device-info

Browse source 
因为 react-native-device-info 引入 gcm 进而引入 androidx 库引起编译失败
This commit is contained in:
mx1700 2019-06-23 16:16:59 +08:00
parent 0787d7b0aa
commit 1e676e3da2
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/build.gradle
View file

@ -146,13 +146,13 @@ dependencies {
implementation project(':react-native-image-crop-picker') implementation project(':react-native-image-crop-picker')
implementation project(':react-native-image-resizer') implementation project(':react-native-image-resizer')
implementation project(':react-native-device-info') // implementation project(':react-native-device-info')
implementation project(':react-native-vector-icons') implementation project(':react-native-vector-icons')
implementation project(':@react-native-community_async-storage') implementation project(':@react-native-community_async-storage')
implementation project(':react-native-navigation') implementation project(':react-native-navigation')
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.0.0' implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
implementation "com.facebook.react:react-native:+" // From node_modules implementation "com.facebook.react:react-native:+" // From node_modules
} }

4
android/app/src/main/java/com/timepill/MainApplication.java
View file

@ -6,7 +6,7 @@ import com.facebook.react.ReactApplication;
import com.RNFetchBlob.RNFetchBlobPackage; import com.RNFetchBlob.RNFetchBlobPackage;
import com.reactnative.ivpusic.imagepicker.PickerPackage; import com.reactnative.ivpusic.imagepicker.PickerPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage; import fr.bamlab.rnimageresizer.ImageResizerPackage;
import com.learnium.RNDeviceInfo.RNDeviceInfo; //import com.learnium.RNDeviceInfo.RNDeviceInfo;
import com.oblador.vectoricons.VectorIconsPackage; import com.oblador.vectoricons.VectorIconsPackage;
import com.reactnativecommunity.asyncstorage.AsyncStoragePackage; import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactNativeHost;
@ -45,7 +45,7 @@ public class MainApplication extends NavigationApplication {
return Arrays.<ReactPackage>asList( return Arrays.<ReactPackage>asList(
// eg. new VectorIconsPackage() // eg. new VectorIconsPackage()
new RNFetchBlobPackage(), new RNFetchBlobPackage(),
new RNDeviceInfo(), //new RNDeviceInfo(),
new VectorIconsPackage(), new VectorIconsPackage(),
new AsyncStoragePackage(), new AsyncStoragePackage(),
new PickerPackage() new PickerPackage()

4
android/gradle.properties
View file

@ -17,5 +17,5 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.useAndroidX=true # android.useAndroidX=true
android.enableJetifier=true # android.enableJetifier=true

4
android/settings.gradle
View file

@ -15,5 +15,5 @@ include ':app'
include ':react-native-navigation' include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/') project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/')
include ':react-native-device-info' //include ':react-native-device-info'
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android') //project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')