Skip to content

Commit

Permalink
处理so崩溃问题,移除oom库
Browse files Browse the repository at this point in the history
  • Loading branch information
hss01248 committed Nov 2, 2021
1 parent 875b3da commit e7f349a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ android {
}
packagingOptions {
// Make sure libjsc.so does not packed in APK
pickFirst '**/libc++_shared.so'
exclude("META-INF/*.kotlin_module")
//pickFirst '**/libc++_shared.so'
//exclude("META-INF/*.kotlin_module")
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -52,7 +52,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation project(path: ':oom')
//implementation project(path: ':oom')
//implementation project(path: ':flipper')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
2 changes: 1 addition & 1 deletion flipper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ repositories {

dependencies {

implementation 'com.facebook.flipper:flipper:0.116.0'
implementation 'com.facebook.flipper:flipper:0.105.0'

//com.facebook.fbjni:fbjni
//implementation 'com.facebook.fbjni:fbjni-java-only:0.0.3'
Expand Down
3 changes: 2 additions & 1 deletion flipper/src/main/java/com/hss01248/flipper/FlipperUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;


import com.facebook.flipper.plugins.leakcanary2.FlipperLeakListener;
import com.facebook.flipper.plugins.leakcanary2.LeakCanary2FlipperPlugin;
import com.facebook.flipper.plugins.network.BodyUtil;
Expand All @@ -34,7 +35,7 @@
import leakcanary.LeakCanary;
import okhttp3.Interceptor;
import okhttp3.OkHttpClient;
import okhttp3.logging.HttpLoggingInterceptor;


/**
官方限定,只能在debugable=true时使用: https://github.com/facebook/flipper/issues/1075
Expand Down
2 changes: 1 addition & 1 deletion network/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
//implementation project(':android')
implementation "com.squareup.okhttp3:okhttp:3.12.12"
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.facebook.flipper:flipper:0.94.1'
implementation 'com.facebook.flipper:flipper:0.105.0'

implementation 'com.google.code.gson:gson:2.8.5'
api 'com.github.hss01248.metadata:metadata:1.1.2'
Expand Down
2 changes: 1 addition & 1 deletion remote3.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ gradle.addProjectEvaluationListener(new ProjectEvaluationListener() {
implementation flipper
implementation dokit
implementation "com.github.simplepeng.SpiderMan:spiderman:v1.1.8"
implementation 'com.facebook.flipper:flipper:0.116.0'
implementation 'com.facebook.flipper:flipper:0.105.0'
}
}else {
project.dependencies {
Expand Down

0 comments on commit e7f349a

Please sign in to comment.