update gradle version

huzongyao · Aug 24, 2019 · 3e8ef90 · 3e8ef90
1 parent 3abff08
commit 3e8ef90
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 46 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,10 +14,10 @@ android {
         applicationId "com.hzy.weex.frame"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 1_00_03
-        versionName "1.0.3"
+        versionCode 1_00_04
+        versionName "1.0.4"
         ndk {
-            abiFilters 'armeabi-v7a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
         resConfigs "zh-rCN"
         javaCompileOptions {
@@ -58,17 +58,17 @@ static def buildTime() {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.alibaba:fastjson:1.1.71.android'
     implementation 'com.taobao.android:weex_sdk:0.26.0'
     implementation 'cn.bingoogolapple:bga-qrcode-zxing:1.3.6'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
-    implementation 'com.blankj:utilcode:1.24.7'
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.1.0'
+    implementation 'com.blankj:utilcode:1.25.3'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.9.0'
     implementation('com.alibaba:arouter-api:1.5.0') {
         exclude group: 'com.android.support'
     }

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -62,10 +62,6 @@
   public *;
 }
 
-#MTA
--keep class com.tencent.stat.*{*;}
--keep class com.tencent.mid.*{*;}
-
 #EventBus
 -keepattributes *Annotation*
 -keepclassmembers class * {

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/ARouterActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/ARouterActivity.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/QRScanActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/QRScanActivity.java
@@ -3,9 +3,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/SplashActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/SplashActivity.java
@@ -1,7 +1,7 @@
 package com.hzy.weex.frame.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/WXPageActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/WXPageActivity.java
@@ -11,10 +11,10 @@
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/base/AbstractWeexActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/base/AbstractWeexActivity.java
@@ -3,10 +3,10 @@
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/base/SimpleWeexActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/base/SimpleWeexActivity.java
@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 @SuppressLint("Registered")
 public class SimpleWeexActivity extends AbstractWeexActivity {

diff --git a/app/src/main/java/com/hzy/weex/frame/activity/base/WXBaseActivity.java b/app/src/main/java/com/hzy/weex/frame/activity/base/WXBaseActivity.java
@@ -1,7 +1,7 @@
 package com.hzy.weex.frame.activity.base;
 
 import android.annotation.SuppressLint;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 @SuppressLint("Registered")
 public class WXBaseActivity extends AppCompatActivity {

diff --git a/app/src/main/java/com/hzy/weex/frame/weex/adapter/GlideImageAdapter.java b/app/src/main/java/com/hzy/weex/frame/weex/adapter/GlideImageAdapter.java
@@ -4,8 +4,8 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.blankj.utilcode.util.StringUtils;

diff --git a/app/src/main/java/com/hzy/weex/frame/weex/adapter/OkWebSocketAdapter.java b/app/src/main/java/com/hzy/weex/frame/weex/adapter/OkWebSocketAdapter.java
@@ -1,6 +1,6 @@
 package com.hzy.weex.frame.weex.adapter;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.taobao.weex.appfram.websocket.IWebSocketAdapter;

diff --git a/app/src/main/java/com/hzy/weex/frame/weex/adapter/WXAnalyzerDelegate.java b/app/src/main/java/com/hzy/weex/frame/weex/adapter/WXAnalyzerDelegate.java
@@ -1,7 +1,7 @@
 package com.hzy.weex.frame.weex.adapter;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;

diff --git a/app/src/main/java/com/hzy/weex/frame/weex/module/ExNavigatorModule.java b/app/src/main/java/com/hzy/weex/frame/weex/module/ExNavigatorModule.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
@@ -324,7 +324,7 @@ private boolean changeVisibilityOfActionBar(Context context, int visibility) {
             e.printStackTrace();
         }
         if (hasAppCompatActivity && mWXSDKInstance.getContext() instanceof AppCompatActivity) {
-            android.support.v7.app.ActionBar actionbar = ((AppCompatActivity) mWXSDKInstance.getContext()).getSupportActionBar();
+            androidx.appcompat.app.ActionBar actionbar = ((AppCompatActivity) mWXSDKInstance.getContext()).getSupportActionBar();
             if (actionbar != null) {
                 switch (visibility) {
                     case Constants.Value.NAV_BAR_HIDDEN:

diff --git a/app/src/main/java/com/hzy/weex/frame/widget/AutoWidthImageView.java b/app/src/main/java/com/hzy/weex/frame/widget/AutoWidthImageView.java
@@ -4,7 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 
-public class AutoWidthImageView extends android.support.v7.widget.AppCompatImageView {
+public class AutoWidthImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     public AutoWidthImageView(Context context) {
         super(context);

diff --git a/app/src/main/java/com/hzy/weex/frame/widget/StatusLayout.java b/app/src/main/java/com/hzy/weex/frame/widget/StatusLayout.java
@@ -1,8 +1,8 @@
 package com.hzy.weex.frame.widget;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/app/src/main/res/layout/activity_weex.xml b/app/src/main/res/layout/activity_weex.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/weex_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -34,7 +34,7 @@
             android:layout_height="match_parent" />
     </FrameLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -6,6 +6,8 @@
 # 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.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 07 11:02:19 CST 2019
+#Sat Aug 24 16:20: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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip