update gradle and change compat to androidx

StomHong · StomHong · commit 5c0db9d127f5 · 2019-11-29T20:34:56.000+08:00
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 ```java
 
 dependencies{
-   compile 'com.stomhong:customizekeyboard:1.0.1'
+   implementation 'com.stomhong:customizekeyboard:1.0.1'
 }
 ```
 
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
 /build
+/.idea
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,37 +1,39 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
-
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
-        applicationId "com.ziyeyouhu.customizekeyboard"
+        applicationId "com.stomhong.customizekeyboard"
         minSdkVersion 14
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 28
+        versionCode 2
+        versionName "1.0.1"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+    }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile project(':library')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation project(':library')
 }
 
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ziyeyouhu.customkeyboard"
+<manifest package="com.stomhong.customkeyboard"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
@@ -10,7 +10,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.ziyeyouhu.customkeyboard.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/com/stomhong/customkeyboard/MainActivity.java b/app/src/main/java/com/stomhong/customkeyboard/MainActivity.java
@@ -1,14 +1,14 @@
-package com.ziyeyouhu.customkeyboard;
+package com.stomhong.customkeyboard;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
-import com.ziyeyouhu.library.KeyboardTouchListener;
-import com.ziyeyouhu.library.KeyboardUtil;
+import com.stomhong.library.KeyboardTouchListener;
+import com.stomhong.library.KeyboardUtil;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/app/src/test/java/com/stomhong/customkeyboard/ExampleUnitTest.java b/app/src/test/java/com/stomhong/customkeyboard/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.customkeyboard;
+package com.stomhong.customkeyboard;
 
 import org.junit.Test;
 
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 10 09:51:23 CST 2017
+#Wed Nov 20 22:28:25 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/.gitignore b/library/.gitignore
@@ -1 +1,2 @@
 /build
+/.idea
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,20 +1,20 @@
 apply plugin: 'com.android.library'
 
 ext {
-    PUBLISH_GROUP_ID = 'com.ziyeyouhu'
+    PUBLISH_GROUP_ID = 'com.stomhong'
     PUBLISH_ARTIFACT_ID = 'customizekeyboard'
-    PUBLISH_VERSION = '1.0.0'
+    PUBLISH_VERSION = '1.0.1'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 29
+        versionCode 2
+        versionName "1.0.1"
     }
     buildTypes {
         release {
@@ -25,8 +25,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
 apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
diff --git a/library/src/androidTest/java/com/stomhong/library/ApplicationTest.java b/library/src/androidTest/java/com/stomhong/library/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="com.ziyeyouhu.library"
+<manifest package="com.stomhong.library"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
diff --git a/library/src/main/java/com/stomhong/library/KeyboardTouchListener.java b/library/src/main/java/com/stomhong/library/KeyboardTouchListener.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/library/src/main/java/com/stomhong/library/KeyboardUtil.java b/library/src/main/java/com/stomhong/library/KeyboardUtil.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/library/src/main/java/com/stomhong/library/PpKeyBoardView.java b/library/src/main/java/com/stomhong/library/PpKeyBoardView.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/library/src/main/java/com/stomhong/library/SIZE.java b/library/src/main/java/com/stomhong/library/SIZE.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 public class SIZE {
 
diff --git a/library/src/main/res/layout/input.xml b/library/src/main/res/layout/input.xml
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp">
         <!-- 普通数字键盘样式 -->
-        <com.ziyeyouhu.library.PpKeyBoardView
+        <com.stomhong.library.PpKeyBoardView
             android:id="@+id/keyboard_view"
             android:layout_weight="1"
             android:layout_centerInParent="true"
@@ -43,7 +43,7 @@
             android:shadowRadius="0.0"
             android:visibility="gone" />
         <!-- 字母键盘样式 -->
-        <com.ziyeyouhu.library.PpKeyBoardView
+        <com.stomhong.library.PpKeyBoardView
             android:id="@+id/keyboard_view_abc_sym"
             android:layout_centerInParent="true"
             android:layout_width="match_parent"
diff --git a/library/src/test/java/com/stomhong/library/ExampleUnitTest.java b/library/src/test/java/com/stomhong/library/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.ziyeyouhu.library;
+package com.stomhong.library;
 
 import org.junit.Test;
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	```java
`10`	`10`
`11`	`11`	`dependencies{`
`12`		`- compile 'com.stomhong:customizekeyboard:1.0.1'`
	`12`	`+ implementation 'com.stomhong:customizekeyboard:1.0.1'`
`13`	`13`	`}`
`14`	`14`	```
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ziyeyouhu.customkeyboard;`
	`1`	`+package com.stomhong.customkeyboard;`
`2`	`2`
`3`	`3`	`import org.junit.Test;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`	`5`	`jcenter()`
	`6`	`+ google()`
`6`	`7`	`}`
`7`	`8`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.0.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.5.1'`
`9`	`10`
`10`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`12`	`// in the individual module build.gradle files`
`@@ -15,6 +16,7 @@ buildscript {`
`15`	`16`	`allprojects {`
`16`	`17`	`repositories {`
`17`	`18`	`jcenter()`
	`19`	`+ google()`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`