Merge pull request #50 from RedrockMobile/develop

5.1.0 v55

.gitignore

@@ -11,3 +11,4 @@
 .externalNativeBuild
 ./key-cyxbs
 local_helper
+secret.gradle

.gitmodules

@@ -55,3 +55,6 @@
 [submodule "module_redrock_home"]
 	path = module_redrock_home
 	url = [email protected]:CyxbsMobile-Android-Submodule/module_redrock_home.git
+[submodule "module_freshman"]
+	path = module_freshman
+	url = [email protected]:CyxbsMobile-Android-Submodule/module_freshman.git

build.gradle

@@ -8,18 +8,23 @@ buildscript {
         lib_config = "${rootDir}/lib_config.gradle"
         module_config = "${rootDir}/module_config.gradle"
         module_dependencies = "${rootDir}/dependencies.gradle"
+        secret = "${rootDir}/secret.gradle"
     }
 
     repositories {
         google()
         jcenter()
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
     }
 
     dependencies {
         classpath "com.android.tools.build:gradle:$gradle_plugins"
         classpath deps.kotlin.gradle
         classpath "com.alibaba:arouter-register:1.0.2"
-        classpath 'com.tencent.bugly:tinker-support:1.1.5'
+        //walle多渠道打包
+        classpath 'com.meituan.android.walle:plugin:1.1.6'
+        // 添加emas-services插件
+        classpath 'com.aliyun.ams:emas-services:1.0.1'
     }
 }
 
@@ -29,12 +34,10 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
+        maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' }
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-/*
-
- */
+}

gradle.properties

@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1024m
+org.gradle.jvmargs=-Xmx2048m
 org.gradle.daemon=true
 org.gradle.parallel=true
 
@@ -27,7 +27,7 @@ kotlin.incremental.java=true
 kotlin.incremental.js=true
 kotlin.caching.enabled=true
 #开启kotlin并行编译
-kotlin.parallel.tasks.in.project=true 
+kotlin.parallel.tasks.in.project=true
 
 
 #优化kapt
@@ -37,3 +37,5 @@ kapt.use.worker.api=true
 kapt.incremental.apt=true
 #kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉最上图中的:app:kaptGenerateStubsDebugKotlin的时间
 kapt.include.compile.classpath=false
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 10 12:52:01 CST 2018
+#Fri Jul 26 16:30:06 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

lib_config.gradle

@@ -9,7 +9,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion build_versions.target_sdk
+    compileSdkVersion build_versions.compile_sdk
     buildToolsVersion build_versions.build_tools
 
     resourcePrefix "${project.getName().replaceAll("lib_", "")}_"
@@ -18,7 +18,7 @@ android {
         minSdkVersion build_versions.min_sdk
         targetSdkVersion build_versions.target_sdk
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     dataBinding {

module_config.gradle

@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion build_versions.target_sdk
+    compileSdkVersion build_versions.compile_sdk
     buildToolsVersion build_versions.build_tools
 
     resourcePrefix "${project.getName().replaceAll("module_", "")}_"
@@ -22,7 +22,7 @@ android {
         minSdkVersion build_versions.min_sdk
         targetSdkVersion build_versions.target_sdk
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         kapt {
             //Arouter

settings.gradle

@@ -3,4 +3,5 @@ include ':module_app', ':lib_common', ':module_main',   //特殊模块
         ':module_othercourse', ':module_noclass', ':module_map',
         ':module_calendar', ':module_electricity', ':module_emptyroom',
         ':module_grades', ':module_volunteer', ':module_schoolcar',
-        ':module_news', ':module_widget', ':module_redrock_home'
+        ':module_news', ':module_widget', ':module_redrock_home',
+        ':module_freshman'

versions.gradle

@@ -1,4 +1,4 @@
-ext.gradle_plugins = '3.1.4'
+ext.gradle_plugins = '3.4.2'
 
 ext.deps = [:]
 
@@ -10,10 +10,11 @@ versions.anko = '0.10.7'
 versions.constraint_layout = '1.1.3'
 versions.support = '27.1.1'
 versions.multidex = '1.0.3'
-//event and router
+// ali
 versions.arouter = '1.4.0'
 versions.arouter_compiler = '1.2.1'
 versions.eventbus = '3.1.1'
+versions.hotfix = '3.2.8'
 //network
 versions.glide = '4.8.0'
 versions.glide_okhttp_integration = '4.8.0'
@@ -40,14 +41,16 @@ versions.umeng_analytics = '7.5.3'
 versions.bugly_crashreport = '2.6.6.1'
 versions.bugly_crashreport_upgrade = '1.3.6'
 versions.bugly_nativecrashreport = '3.3.1'
-versions.bugly_tinker_lib = '1.9.9'
+//walle
+versions.walle = '1.1.6'
 
 def deps = [:]
 
 def build_versions = [:]
 build_versions.min_sdk = 19
 build_versions.target_sdk = 26
-build_versions.build_tools = "27.0.3"
+build_versions.compile_sdk = 28
+build_versions.build_tools = "28.0.3"
 ext.build_versions = build_versions
 
 def kotlin = [:]
@@ -57,13 +60,13 @@ kotlin.anko = "org.jetbrains.anko:anko:$versions.anko"
 deps.kotlin = kotlin
 
 def support = [:]
-support.constraint = "com.android.support.constraint:constraint-layout:$versions.constraint_layout"
-support.app_compat = "com.android.support:appcompat-v7:$versions.support"
-support.recyclerview = "com.android.support:recyclerview-v7:$versions.support"
-support.cardview = "com.android.support:cardview-v7:$versions.support"
-support.design = "com.android.support:design:$versions.support"
-support.v4 = "com.android.support:support-v4:$versions.support"
-support.multidex = "com.android.support:multidex:$versions.multidex"
+support.constraint = 'androidx.constraintlayout:constraintlayout:1.1.3'
+support.app_compat = 'androidx.appcompat:appcompat:1.0.0'
+support.recyclerview = 'androidx.recyclerview:recyclerview:1.0.0'
+support.cardview = 'androidx.cardview:cardview:1.0.0'
+support.design = 'com.google.android.material:material:1.0.0'
+support.v4 = 'androidx.legacy:legacy-support-v4:1.0.0'
+support.multidex = 'androidx.multidex:multidex:2.0.0'
 deps.support = support
 
 def arouter = [:]
@@ -102,20 +105,20 @@ gson.runtime = "com.google.code.gson:gson:$versions.gson"
 deps.gson = gson
 
 def lifecycle = [:]
-lifecycle.extensions = "android.arch.lifecycle:extensions:$versions.lifecycle"
-lifecycle.java8 = "android.arch.lifecycle:common-java8:$versions.lifecycle"
-lifecycle.reactivestrean = "android.arch.lifecycle:reactivestreams:$versions.lifecycle"
-lifecycle.compiler = "android.arch.lifecycle:compiler:$versions.lifecycle"
+lifecycle.extensions = 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+lifecycle.java8 = 'androidx.lifecycle:lifecycle-common-java8:2.0.0'
+lifecycle.reactivestrean = 'androidx.lifecycle:lifecycle-reactivestreams:2.0.0'
+lifecycle.compiler = 'androidx.lifecycle:lifecycle-compiler:2.0.0'
 deps.lifecycle = lifecycle
 
 def room = [:]
-room.runtime = "android.arch.persistence.room:runtime:$versions.room"
-room.compiler = "android.arch.persistence.room:compiler:$versions.room"
-room.rxjava = "android.arch.persistence.room:rxjava2:$versions.room"
+room.runtime = 'androidx.room:room-runtime:2.0.0'
+room.compiler = 'androidx.room:room-compiler:2.0.0'
+room.rxjava = 'androidx.room:room-rxjava2:2.0.0'
 deps.room = room
 
 def paging = [:]
-paging.runtime = "android.arch.paging:runtime:$versions.paging"
+paging.runtime = 'androidx.paging:paging-runtime:2.0.0'
 paging.rxjava = "android.arch.paging:rxjava2:1.0.0-rc1"
 deps.paging = paging
 
@@ -124,7 +127,7 @@ workmanager.runtime = "android.arch.work:work-runtime:$versions.workmanager"
 deps.workmanager = workmanager
 
 def databinding = [:]
-databinding.compiler = "com.android.databinding:compiler:3.1.4"
+databinding.compiler = 'androidx.databinding:databinding-compiler:1.0.0'
 deps.databinding = databinding
 
 def dagger = [:]
@@ -148,7 +151,14 @@ def bugly = [:]
 bugly.crashreport = "com.tencent.bugly:crashreport:$versions.bugly_crashreport"
 bugly.crashreport_upgrade = "com.tencent.bugly:crashreport_upgrade:$versions.bugly_crashreport_upgrade"
 bugly.nativecrashreport = "com.tencent.bugly:nativecrashreport:$versions.bugly_nativecrashreport"
-bugly.tinker_lib = "com.tencent.tinker:tinker-android-lib:$versions.bugly_tinker_lib"
 deps.bugly = bugly
 
+def walle = [:]
+walle.runtime = "com.meituan.android.walle:library:$versions.walle"
+deps.walle = walle
+
+def hotfix = [:]
+hotfix.runtime = 'com.aliyun.ams:alicloud-android-hotfix:$versions.hotfix'
+deps.hotfix = hotfix
+
 ext.deps = deps