build: update dependency

build.gradle

@@ -9,8 +9,8 @@ buildscript {
  mavenCentral()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
- classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
+ classpath 'com.android.tools.build:gradle:3.6.4'
+ classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -27,7 +27,7 @@ allprojects {
 
  gradle.taskGraph.whenReady {
  tasks.each { task ->
- if (task.name.equals('mockableAndroidJar')) {
+ if (task.name == 'mockableAndroidJar') {
  task.enabled = false
  }
  }
@@ -48,7 +48,7 @@ def currentVersionCode = (majorVersion + 1) * 200 + minorVersion * 20 + buildVer
 
 def baseVersionName = "${majorVersion}.${minorVersion}.${buildVersion}"
 
-def releaseTime() {
+static def releaseTime() {
  return new Date().format("yyyyMMdd", TimeZone.getTimeZone("UTC"))
 }
 
@@ -70,7 +70,7 @@ ext {
  rxVersion = "2.1.16"
  rxAndroidVersion = "2.0.2"
  // Work
- work_version = "1.0.0-alpha05"
+ work_version = '1.0.1'
 }
 
 task exportVersion(type: Exec) {

common/build.gradle

@@ -4,7 +4,6 @@ apply plugin: 'com.android.library'
 
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
 
  defaultConfig {
  minSdkVersion rootProject.ext.minSdkVersion
@@ -40,7 +39,7 @@ dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])
 
  testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
  implementation "com.android.support:support-v4:$supportLibraryVersion"
 }

condom/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
 
  defaultConfig {
  minSdkVersion rootProject.ext.minSdkVersion
@@ -31,12 +30,12 @@ android {
 }
 
 dependencies {
- compile 'com.google.code.findbugs:jsr305:3.0.1'
- compile "com.android.support:support-annotations:$supportLibraryVersion"
+ api 'com.google.code.findbugs:jsr305:3.0.1'
+ api "com.android.support:support-annotations:$supportLibraryVersion"
 
- androidTestCompile 'com.android.support.test:runner:0.5'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
 
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.12'
 }
 
 android.libraryVariants.all { variant ->

extenders/build.gradle

@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
 
  defaultConfig {
  minSdkVersion rootProject.ext.minSdkVersion
@@ -26,7 +25,7 @@ android {
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])
  testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
  implementation "com.android.support:support-v4:$supportLibraryVersion"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Oct 03 21:31:15 CST 2018
+#Sat Sep 04 16:12:50 CST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+zipStoreBase=GRADLE_USER_HOME

provider/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'org.greenrobot.greendao'
 
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
 
  defaultConfig {
  minSdkVersion rootProject.ext.minSdkVersion
@@ -41,11 +40,11 @@ android.libraryVariants.all { variant ->
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
  // GreenDao
- implementation 'org.greenrobot:greendao:3.2.2'
- implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.0.0'
+ implementation 'org.greenrobot:greendao:3.3.0'
+ implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1'
 
  implementation "com.android.support:support-v4:$supportLibraryVersion"
  implementation project(':common')

push/build.gradle

@@ -2,19 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 repositories {
- maven { url 'https://dl.bintray.com/heruoxin/icebox' }
+ maven { url 'https://jitpack.io' }
 }
 
 
 android {
  compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
 
  defaultConfig {
  applicationId "com.xiaomi.xmsf"
  minSdkVersion rootProject.ext.minSdkVersion
  // Keep alive
- targetSdkVersion 23
+ targetSdkVersion 31
  // XMPush sdk requires XMPushService not exported, but sdk will start exported XMPushService after
  // XMSF version code 106. SDK will also check version code must >= 105.
  versionCode 105
@@ -95,23 +94,24 @@ android.applicationVariants.all { variant ->
 dependencies {
 
  implementation fileTree(include: ['*.jar'], dir: 'libs')
+ //noinspection GradleDependency
  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
  // Log
  implementation('com.elvishew:xlog:1.6.1', {
  exclude group: 'com.android.support'
  })
  // Hook
  testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.1'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
  implementation project(':common')
  implementation project(':condom')
  implementation "com.android.support:support-v4:$supportLibraryVersion"
  implementation project(':provider')
  implementation project(':extenders')
  implementation "com.android.support:palette-v7:$supportLibraryVersion"
 
- implementation 'com.catchingnow.icebox:SDK:1.0.5'
+ implementation 'com.github.heruoxin:IceBox-SDK:55dd857d74'
 
  implementation('com.github.AndroidSnippet:SetupWizardLibCompat:0.3', {
  exclude group: 'com.android.support'
@@ -130,7 +130,7 @@ dependencies {
  implementation 'moe.shizuku.preference:preference-simplemenu:2.2.3'
 
  // Help
- implementation('moe.shizuku.support:helplib:1.1.0', {
+ implementation('com.github.yfdyh000.RikkaX:helplib:mipush_helplib-SNAPSHOT', {
  exclude group: 'moe.shizuku.preference'
  exclude group: 'com.android.support'
  })
@@ -156,11 +156,14 @@ dependencies {
 
 buildscript {
  repositories {
+ //noinspection JcenterRepositoryObsolete
  jcenter()
-
+ flatDir {
+ dirs 'libs'
+ }
  }
  dependencies {
- classpath 'com.bryansharp:hibeaver:1.2.7'
+ classpath 'com.bryansharp:hibeaver:1.2.8-SNAPSHOT'
  }
 }
 
@@ -184,7 +187,7 @@ hiBeaver {
 
  //this is the most important part
  modifyMatchMaps = [
- 'com.xiaomi.channel.commonutils.android.MIUIUtils'  : [
+ 'com.xiaomi.channel.commonutils.android.MIUIUtils' : [
  ['methodName': 'getIsMIUI', 'methodDesc': '()I', 'adapter': {
  ClassVisitor cv, int access, String name, String desc, String signature, String[] exceptions ->
 
@@ -195,7 +198,7 @@ hiBeaver {
  void visitCode() {
  //super.visitCode()
  methodVisitor.visitLdcInsn(name);
- methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, MethodLogAdapter.className2Path("top.trumeet.mipushframework.Hook"), "hookXM", "(Ljava/lang/Object;)V");
+ methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, className2Path("top.trumeet.mipushframework.Hook"), "hookXM", "(Ljava/lang/Object;)V");
 
  methodVisitor.visitInsn(Opcodes.ICONST_1);
  methodVisitor.visitVarInsn(Opcodes.ISTORE, 0);
@@ -207,7 +210,7 @@ hiBeaver {
  return adapter;
  }]
  ],
- 'com.xiaomi.channel.commonutils.android.DeviceInfo' : [
+ 'com.xiaomi.channel.commonutils.android.DeviceInfo': [
  ['methodName': 'quicklyGetIMEI', 'methodDesc': '(Landroid/content/Context;)Ljava/lang/String;', 'adapter': {
  ClassVisitor cv, int access, String name, String desc, String signature, String[] exceptions ->
 
@@ -218,7 +221,7 @@ hiBeaver {
  void visitCode() {
  //super.visitCode()
  methodVisitor.visitLdcInsn(name);
- methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, MethodLogAdapter.className2Path("top.trumeet.mipushframework.Hook"), "hookXM", "(Ljava/lang/Object;)V");
+ methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, className2Path("top.trumeet.mipushframework.Hook"), "hookXM", "(Ljava/lang/Object;)V");
 
  methodVisitor.visitLdcInsn("");
  methodVisitor.visitVarInsn(Opcodes.ASTORE, 1);