diff --git a/gradle.properties b/gradle.properties index dfc011be48..2089dfd918 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx1536m # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=false +android.enableJetifier=true ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ @@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本, true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.2.1.17 @@ -94,6 +94,7 @@ MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT # 闪屏页 MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT +MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT ## 产品库必备配置 applicationId=com.mogo.launcer diff --git a/modules/mogo-module-authorize/build.gradle b/modules/mogo-module-authorize/build.gradle index f1cf437d8a..d4c26dedca 100644 --- a/modules/mogo-module-authorize/build.gradle +++ b/modules/mogo-module-authorize/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' apply plugin: 'android-aspectjx' diff --git a/modules/mogo-module-back/build.gradle b/modules/mogo-module-back/build.gradle index 189b1d9f44..0828b599aa 100644 --- a/modules/mogo-module-back/build.gradle +++ b/modules/mogo-module-back/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-event-panel-noop/build.gradle b/modules/mogo-module-event-panel-noop/build.gradle index 48c2ef759d..2bd80f619d 100644 --- a/modules/mogo-module-event-panel-noop/build.gradle +++ b/modules/mogo-module-event-panel-noop/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-event-panel/build.gradle b/modules/mogo-module-event-panel/build.gradle index 393dcdbf49..4fdf60062d 100644 --- a/modules/mogo-module-event-panel/build.gradle +++ b/modules/mogo-module-event-panel/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-left-panel-noop/build.gradle b/modules/mogo-module-left-panel-noop/build.gradle index 48c2ef759d..2bd80f619d 100644 --- a/modules/mogo-module-left-panel-noop/build.gradle +++ b/modules/mogo-module-left-panel-noop/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-left-panel/build.gradle b/modules/mogo-module-left-panel/build.gradle index b8428afdfb..509929f10c 100644 --- a/modules/mogo-module-left-panel/build.gradle +++ b/modules/mogo-module-left-panel/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle index 3545c6498a..45c37a3971 100644 --- a/modules/mogo-module-obu/build.gradle +++ b/modules/mogo-module-obu/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-splash-noop/build.gradle b/modules/mogo-module-splash-noop/build.gradle index b8428afdfb..509929f10c 100644 --- a/modules/mogo-module-splash-noop/build.gradle +++ b/modules/mogo-module-splash-noop/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android { diff --git a/modules/mogo-module-splash/build.gradle b/modules/mogo-module-splash/build.gradle index b8428afdfb..509929f10c 100644 --- a/modules/mogo-module-splash/build.gradle +++ b/modules/mogo-module-splash/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' -apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' apply plugin: 'com.alibaba.arouter' android {