diff --git a/app/build.gradle b/app/build.gradle index c035cc6a4c..0d7cf0b44c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { sourceSets { main { - if (!rootProject.isReleaseBuild()) { + if (rootProject.isJunkDetectEnable()) { java.srcDirs = ['src/main/java', 'src/debug/java'] } else { java.srcDirs = ['src/main/java'] @@ -224,7 +224,7 @@ dependencies { implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.lancetx_runtime - if (!rootProject.isJunkDetectEnable()) { + if (rootProject.isJunkDetectEnable()) { implementation rootProject.ext.dependencies.lancetx_compiler_lib implementation rootProject.ext.dependencies.handler_proxy_runtime diff --git a/build.gradle b/build.gradle index 92588d34d0..c8b6606972 100644 --- a/build.gradle +++ b/build.gradle @@ -173,5 +173,5 @@ boolean isReleaseBuild() { } boolean isJunkDetectEnable() { - return isReleaseBuild() + return !isReleaseBuild() } \ No newline at end of file diff --git a/config.gradle b/config.gradle index e07012c62a..76b995986c 100644 --- a/config.gradle +++ b/config.gradle @@ -228,7 +228,7 @@ ext { passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", // 主线程卡顿监测 - block_detector : "com.mogo.eagle.core.block:runtime:10.90.20", + block_detector : "com.mogo.eagle.core.block:runtime:10.90.30", //======================== google auto-service =============== google_auto_service : "com.google.auto.service:auto-service:1.0-rc7", diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index e3ea1d2cc6..ece83923bd 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -103,9 +103,7 @@ dependencies { implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-res') - if (!rootProject.isJunkDetectEnable()) { - compileOnly rootProject.ext.dependencies.apm_insight - } + compileOnly rootProject.ext.dependencies.apm_insight } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/gradle/bytex/bytex_handler_proxy.gradle b/gradle/bytex/bytex_handler_proxy.gradle index ef50728d6a..e55b245397 100644 --- a/gradle/bytex/bytex_handler_proxy.gradle +++ b/gradle/bytex/bytex_handler_proxy.gradle @@ -1,6 +1,6 @@ apply plugin: 'bytex.handler_proxy' handler_proxy { - enable !rootProject.isJunkDetectEnable() - enableInDebug !rootProject.isJunkDetectEnable() + enable rootProject.isJunkDetectEnable() + enableInDebug rootProject.isJunkDetectEnable() } diff --git a/gradle/bytex/bytex_lancetx.gradle b/gradle/bytex/bytex_lancetx.gradle index 0d6e97431e..d4cbbd960e 100644 --- a/gradle/bytex/bytex_lancetx.gradle +++ b/gradle/bytex/bytex_lancetx.gradle @@ -8,7 +8,7 @@ LancetX { "com.zhjt.mogo_core_function_devatools.perf" ] synchronizedLock { - enabled !rootProject.isJunkDetectEnable() + enabled rootProject.isJunkDetectEnable() blackList = [ "okio.AsyncTimeout\$Watchdog" ] @@ -28,7 +28,7 @@ LancetX { enable true } main_block_check { - enable !rootProject.isJunkDetectEnable() + enable rootProject.isJunkDetectEnable() } } }