upgrade gradle version

xuzhou · xuzhou · commit 38d70da79dd1 · 2020-12-10T20:48:35.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,21 +8,25 @@ android {
             storeFile file('./darkal.jks')
             storePassword '333333'
             v1SigningEnabled true
-            v2SigningEnabled false
+            v2SigningEnabled true
         }
     }
     dexOptions {
         javaMaxHeapSize "4g"
     }
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
     dataBinding {
         enabled = true
     }
+    buildFeatures {
+        dataBinding true
+        viewBinding true
+    }
     defaultConfig {
         applicationId "cn.darkal.networkdiagnosis"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 30
         versionCode 31
         versionName "3.2.31"
         // Enabling multidex support.
@@ -70,16 +74,17 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
     implementation 'com.jakewharton:butterknife:8.8.1'
+//    annotationProcessor 'com.android.databinding:compiler:3.1.3'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'com.android.databinding:library:3.1.3'
     implementation 'com.android.databinding:adapters:3.1.3'
     implementation 'com.squareup.okhttp3:okhttp:3.4.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:gridlayout-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:gridlayout-v7:28.0.0'
     //    compile 'com.android.support:cardview-v7:24.0.0'
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
     implementation 'com.android.support:multidex:1.0.3'
     // littleproxy及其依赖
     implementation('net.lightbody.bmp:littleproxy:1.1.0-beta-bmp-17') {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -21,7 +21,7 @@
 -dontpreverify                   # 混淆时是否做预校验
 -verbose                         # 混淆时是否记录日志
 -keepattributes *Annotation*     # 保持注解
--ignorewarning                   # 忽略警告
+#-ignorewarning                   # 忽略警告
 -dontoptimize                    # 优化不优化输入的类文件
 
 -optimizations !code/simplification/arithmetic,!field/*,!class/merging/*  # 混淆时所采用的算法
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Activity/ChangeFilterActivity.java b/app/src/main/java/cn/darkal/networkdiagnosis/Activity/ChangeFilterActivity.java
@@ -14,15 +14,13 @@
 import android.widget.RelativeLayout;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.darkal.networkdiagnosis.Adapter.ContentFilterAdapter;
-import cn.darkal.networkdiagnosis.Bean.ResponseFilterRule;
+import cn.darkal.networkdiagnosis.bean.ResponseFilterRule;
 import cn.darkal.networkdiagnosis.R;
 import cn.darkal.networkdiagnosis.SysApplication;
-import cn.darkal.networkdiagnosis.Utils.DeviceUtils;
 import cn.darkal.networkdiagnosis.Utils.SharedPreferenceUtils;
 
 public class ChangeFilterActivity extends AppCompatActivity {
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java b/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java
@@ -74,7 +74,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import cn.darkal.networkdiagnosis.Adapter.PageFilterAdapter;
-import cn.darkal.networkdiagnosis.Bean.PageBean;
+import cn.darkal.networkdiagnosis.bean.PageBean;
 import cn.darkal.networkdiagnosis.Fragment.BaseFragment;
 import cn.darkal.networkdiagnosis.Fragment.BackHandledInterface;
 import cn.darkal.networkdiagnosis.Fragment.NetworkFragment;
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Adapter/ContentFilterAdapter.java b/app/src/main/java/cn/darkal/networkdiagnosis/Adapter/ContentFilterAdapter.java
@@ -12,14 +12,9 @@
 import java.util.List;
 
 import cn.darkal.networkdiagnosis.Activity.ChangeFilterActivity;
-import cn.darkal.networkdiagnosis.Activity.MainActivity;
 import cn.darkal.networkdiagnosis.BR;
-import cn.darkal.networkdiagnosis.Bean.PageBean;
-import cn.darkal.networkdiagnosis.Bean.ResponseFilterRule;
-import cn.darkal.networkdiagnosis.Fragment.PreviewFragment;
+import cn.darkal.networkdiagnosis.bean.ResponseFilterRule;
 import cn.darkal.networkdiagnosis.R;
-import cn.darkal.networkdiagnosis.SysApplication;
-import cn.darkal.networkdiagnosis.Utils.DeviceUtils;
 
 /**
  * Created by Darkal on 2016/9/5.
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Adapter/PageFilterAdapter.java b/app/src/main/java/cn/darkal/networkdiagnosis/Adapter/PageFilterAdapter.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import cn.darkal.networkdiagnosis.Bean.PageBean;
+import cn.darkal.networkdiagnosis.bean.PageBean;
 import cn.darkal.networkdiagnosis.BR;
 import cn.darkal.networkdiagnosis.R;
 
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/SysApplication.java b/app/src/main/java/cn/darkal/networkdiagnosis/SysApplication.java
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.Random;
 
-import cn.darkal.networkdiagnosis.Bean.ResponseFilterRule;
+import cn.darkal.networkdiagnosis.bean.ResponseFilterRule;
 import cn.darkal.networkdiagnosis.Utils.DeviceUtils;
 import cn.darkal.networkdiagnosis.Utils.SharedPreferenceUtils;
 
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Utils/DeviceUtils.java b/app/src/main/java/cn/darkal/networkdiagnosis/Utils/DeviceUtils.java
@@ -6,23 +6,15 @@
 import android.util.Log;
 
 import net.lightbody.bmp.BrowserMobProxy;
-import net.lightbody.bmp.filters.RequestFilter;
 import net.lightbody.bmp.filters.ResponseFilter;
 import net.lightbody.bmp.proxy.dns.AdvancedHostResolver;
 import net.lightbody.bmp.util.HttpMessageContents;
 import net.lightbody.bmp.util.HttpMessageInfo;
 
-import org.littleshoot.proxy.HttpFilters;
-import org.littleshoot.proxy.HttpFiltersSource;
-
-import java.net.InetSocketAddress;
 import java.util.List;
 
-import cn.darkal.networkdiagnosis.Bean.ResponseFilterRule;
+import cn.darkal.networkdiagnosis.bean.ResponseFilterRule;
 import cn.darkal.networkdiagnosis.SysApplication;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.HttpObject;
-import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 
 /**
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/bean/PageBean.java b/app/src/main/java/cn/darkal/networkdiagnosis/bean/PageBean.java
@@ -1,4 +1,4 @@
-package cn.darkal.networkdiagnosis.Bean;
+package cn.darkal.networkdiagnosis.bean;
 
 /**
  * Created by xuzhou on 2016/9/5.
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/bean/ResponseFilterRule.java b/app/src/main/java/cn/darkal/networkdiagnosis/bean/ResponseFilterRule.java
@@ -1,8 +1,8 @@
-package cn.darkal.networkdiagnosis.Bean;
+package cn.darkal.networkdiagnosis.bean;
 
 import java.io.Serializable;
 
-import static cn.darkal.networkdiagnosis.Bean.ResponseFilterRule.RULE_TYPE.STRING_REPLACE;
+import static cn.darkal.networkdiagnosis.bean.ResponseFilterRule.RULE_TYPE.STRING_REPLACE;
 
 /**
  * Created by darkal on 2017/5/31.
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
@@ -4,7 +4,7 @@
     <data>
         <variable
             name="pages"
-            type="cn.darkal.networkdiagnosis.Bean.ResponseFilterRule" />
+            type="cn.darkal.networkdiagnosis.bean.ResponseFilterRule" />
     </data>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/item_pages.xml b/app/src/main/res/layout/item_pages.xml
@@ -4,7 +4,7 @@
     <data>
         <variable
             name="pages"
-            type="cn.darkal.networkdiagnosis.Bean.PageBean" />
+            type="cn.darkal.networkdiagnosis.bean.PageBean" />
     </data>
 
     <FrameLayout
diff --git a/app/src/main/res/values/zxing_ids.xml b/app/src/main/res/values/zxing_ids.xml
@@ -34,6 +34,6 @@
   <item type="id" name="gridview" />
   <item type="id" name="webview" />
   
-  <item type="id" name="about_version_code">false</item>
-  <item type="id" name="split">false</item>
+  <item type="id" name="about_version_code"/>
+  <item type="id" name="split"/>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.tencent.bugly:symtabfileuploader:latest.release'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 05 14:53:57 CST 2018
+#Wed Dec 09 15:54:43 CST 2020
 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-6.5-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cn.darkal.networkdiagnosis.Bean;`
	`1`	`+package cn.darkal.networkdiagnosis.bean;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Created by xuzhou on 2016/9/5.`