升级Gradle

Gavin-ZYX · Jun 18, 2019 · 13946af · 13946af
1 parent ed709cb
commit 13946af
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 49 deletions.
diff --git a/apmTools/build.gradle b/apmTools/build.gradle
@@ -22,6 +22,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,11 +20,10 @@ android {
 }
 
 dependencies {
-    compile project(':stickyDecoration')
-    compile project(':apmTools')
-    compile rootProject.ext.dependencies['appcompat-v7']
-    compile 'com.jakewharton:butterknife:8.6.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
-    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.5.1'
+    implementation project(':stickyDecoration')
+    implementation project(':apmTools')
+    implementation rootProject.ext.dependencies['appcompat-v7']
+    implementation rootProject.ext.dependencies['recyclerview-v7']
+    implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.5.1'
 }
 
diff --git a/app/src/main/java/com/gavin/com/stickydecoration/view/BeautifulRecyclerViewActivity.java b/app/src/main/java/com/gavin/com/stickydecoration/view/BeautifulRecyclerViewActivity.java
@@ -2,7 +2,7 @@
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -23,15 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 自定义View悬浮
  */
-public class BeautifulRecyclerViewActivity extends ActionBarActivity {
+public class BeautifulRecyclerViewActivity extends AppCompatActivity {
 
-    @BindView(R.id.rv)
     RecyclerView mRv;
 
     RecyclerView.Adapter mAdapter;
@@ -42,12 +39,12 @@ public class BeautifulRecyclerViewActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sticky_recycler_view);
-        ButterKnife.bind(this);
         initView();
         initApm();
     }
 
     private void initView() {
+        mRv = findViewById(R.id.rv);
         //模拟数据
         dataList.addAll(CityUtil.getCityList());
         dataList.addAll(CityUtil.getCityList());

diff --git a/app/src/main/java/com/gavin/com/stickydecoration/view/ExpandableActivity.java b/app/src/main/java/com/gavin/com/stickydecoration/view/ExpandableActivity.java
@@ -1,7 +1,7 @@
 package com.gavin.com.stickydecoration.view;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -21,15 +21,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 可展开的recyclerview View悬浮
  */
-public class ExpandableActivity extends ActionBarActivity {
+public class ExpandableActivity extends AppCompatActivity {
 
-    @BindView(R.id.rv)
     RecyclerView mRv;
 
     RecyclerView.Adapter mAdapter;
@@ -40,11 +37,11 @@ public class ExpandableActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sticky_recycler_view);
-        ButterKnife.bind(this);
         initView();
     }
 
     private void initView() {
+        mRv = findViewById(R.id.rv);
         //模拟数据
         dataList.addAll(CityUtil.getCityList());
 

diff --git a/...src/main/java/com/gavin/com/stickydecoration/view/PowerfulStickyRecyclerViewActivity.java b/...src/main/java/com/gavin/com/stickydecoration/view/PowerfulStickyRecyclerViewActivity.java
@@ -25,15 +25,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 自定义View悬浮
  */
 public class PowerfulStickyRecyclerViewActivity extends AppCompatActivity {
 
-    @BindView(R.id.rv)
     RecyclerView mRv;
 
     RecyclerView.Adapter mAdapter;
@@ -44,11 +41,11 @@ public class PowerfulStickyRecyclerViewActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sticky_recycler_view);
-        ButterKnife.bind(this);
         initView();
     }
 
     private void initView() {
+        mRv = findViewById(R.id.rv);
         //模拟数据
         dataList.addAll(CityUtil.getCityList());
         dataList.addAll(CityUtil.getCityList());
@@ -132,12 +129,11 @@ public int getItemCount() {
     }
 
     static class Holder extends RecyclerView.ViewHolder {
-        @BindView(R.id.tv)
         TextView mTextView;
 
         public Holder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            mTextView = itemView.findViewById(R.id.tv);
         }
     }
 

diff --git a/app/src/main/java/com/gavin/com/stickydecoration/view/StickyRecyclerViewActivity.java b/app/src/main/java/com/gavin/com/stickydecoration/view/StickyRecyclerViewActivity.java
@@ -25,16 +25,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * 文字悬浮
  */
 public class StickyRecyclerViewActivity extends AppCompatActivity {
     // TODO: gavin 2018/2/9 已知问题： notifyItemRemoved notifyItemRangeChanged时，界面渲染闪烁问题
 
-    @BindView(R.id.rv)
     MyRecyclerView mRecyclerView;
 
     RecyclerView.Adapter mAdapter;
@@ -45,11 +42,11 @@ public class StickyRecyclerViewActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sticky_recycler_view);
-        ButterKnife.bind(this);
         initView();
     }
 
     private void initView() {
+        mRecyclerView = findViewById(R.id.rv);
         //模拟数据
         dataList.addAll(CityUtil.getCityList());
         dataList.addAll(CityUtil.getCityList());
@@ -127,12 +124,11 @@ public int getItemCount() {
     }
 
     static class Holder extends RecyclerView.ViewHolder {
-        @BindView(R.id.tv)
         TextView mTextView;
 
         public Holder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            mTextView = itemView.findViewById(R.id.tv);
         }
     }
 

diff --git a/app/src/main/java/com/gavin/com/stickydecoration/view/adapter/SimpleAdapter.java b/app/src/main/java/com/gavin/com/stickydecoration/view/adapter/SimpleAdapter.java
@@ -15,8 +15,6 @@
 
 import java.util.List;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * Created by gavin
@@ -83,18 +81,17 @@ public int getItemCount() {
 
 
     static class ViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.iv_city)
         ImageView mIvCity;
-        @BindView(R.id.tv_city)
         TextView mTvCity;
-        @BindView(R.id.tv_brief)
         TextView mTvBrief;
-        @BindView(R.id.ll_bg)
         LinearLayout mLlBg;
 
         ViewHolder(View view) {
             super(view);
-            ButterKnife.bind(this, view);
+            mIvCity = view.findViewById(R.id.iv_city);
+            mTvCity = view.findViewById(R.id.tv_city);
+            mTvBrief = view.findViewById(R.id.tv_brief);
+            mLlBg = view.findViewById(R.id.ll_bg);
         }
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -8,10 +8,10 @@ buildscript {
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
-        classpath 'com.jakewharton:butterknife-gradle-plugin:8.6.0'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,13 +1,13 @@
 ext {
-    compileSdkVersion = 25
-    buildToolsVersion = '25.0.2'
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
     minSdkVersion = 14
     targetSdkVersion = 25
     versionCode = 1
     versionName = "1.0"
 
-    dependencies = ["appcompat-v7"   : "com.android.support:appcompat-v7:22.2.1",
-                    "recyclerview-v7": "com.android.support:recyclerview-v7:23.0.0",
-                    "support-v4"     : "com.android.support:support-v4:25.1.0",
-                    "support-v7"     : "com.android.support:support-v7:25.0.0"]
+    dependencies = ["appcompat-v7"   : "com.android.support:appcompat-v7:28.0.0",
+                    "recyclerview-v7": "com.android.support:recyclerview-v7:28.0.0",
+                    "support-v4"     : "com.android.support:support-v4:28.0.0",
+                    "support-v7"     : "com.android.support:support-v7:28.0.0"]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 25 13:52:26 CST 2017
+#Tue Jun 18 12:57:08 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/stickyDecoration/build.gradle b/stickyDecoration/build.gradle
@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    compile rootProject.ext.dependencies['recyclerview-v7']
+    implementation rootProject.ext.dependencies['recyclerview-v7']
 }
 
 //gradle install