Merge pull request #6 from javichaques/master

anton-knyazev · web-flow · commit eda152cbe11a · 2018-10-17T10:29:05.000+03:00
Update Kotlin version, Android SDK and migrate to AndroidX
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ allprojects {
 **Step 2.** Add the dependency
 ```
 dependencies {
-    compile 'com.github.Omega-R:OmegaCenterIconButton:0.0.1@aar'
+    implementation 'com.github.Omega-R:OmegaCenterIconButton:0.0.3@aar'
 }
 ```
 
@@ -33,10 +33,8 @@ Example of usage in xml layout
     <com.omega_r.libs.OmegaCenterIconButton
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_android_black_24dp"
-        android:text="Great"
-        android:textSize="14sp"
-        android:theme="@style/BlueButtonStyle"/>
+        android:drawableStart="@drawable/ic_android_black_24dp"
+        android:text="Great"/>
 ```
 
 # License
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,15 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+
     defaultConfig {
         applicationId "com.omega"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -22,12 +23,8 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    api "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    api "com.android.support:appcompat-v7:$supportLibraryVersion"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    api "androidx.appcompat:appcompat:$appCompatLibraryVersion"
 
     api project(":center_icon_button")
-
-    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'
 }
diff --git a/app/src/androidTest/java/com/omega/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/omega/ExampleInstrumentedTest.kt
diff --git a/app/src/main/java/com/omega/MainActivity.kt b/app/src/main/java/com/omega/MainActivity.kt
@@ -1,7 +1,7 @@
 package com.omega
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/test/java/com/omega/ExampleUnitTest.kt b/app/src/test/java/com/omega/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
@@ -1,25 +1,21 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.kotlin_version = '1.2.30'
-    ext.supportLibraryVersion = '27.1.1'
-    ext.targetSdkVersion = 27
-    ext.compileSdkVersion = 27
+    ext.kotlinVersion = '1.2.71'
+    ext.appCompatLibraryVersion = '1.0.0'
+    ext.targetSdkVersion = 28
+    ext.compileSdkVersion = 28
     ext.minSdkVersion = 14
 
 
     repositories {
         google()
         jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
diff --git a/center_icon_button/build.gradle b/center_icon_button/build.gradle
@@ -10,9 +10,6 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -21,10 +18,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
+    compileOnly "androidx.appcompat:appcompat:$appCompatLibraryVersion"
 }
diff --git a/center_icon_button/src/main/AndroidManifest.xml b/center_icon_button/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.omega_r.libs.centericonbutton" />
+<manifest package="com.omega_r.libs.centericonbutton" />
diff --git a/center_icon_button/src/main/java/com/omega_r/libs/OmegaCenterIconButton.java b/center_icon_button/src/main/java/com/omega_r/libs/OmegaCenterIconButton.java
@@ -6,11 +6,6 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.widget.AppCompatButton;
 import android.text.method.TransformationMethod;
 import android.util.AttributeSet;
 
@@ -20,6 +15,12 @@
 import java.util.List;
 import java.util.StringTokenizer;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.core.graphics.drawable.DrawableCompat;
+
 public class OmegaCenterIconButton extends AppCompatButton {
 
     private static final String DELIMITERS = "\n";
@@ -181,11 +182,10 @@ private String divideText() {
         return isAllCaps() ? longPart.toUpperCase() : longPart;
     }
 
-    private boolean isAllCaps() {
+    public boolean isAllCaps() {
         TransformationMethod method = getTransformationMethod();
         if(method == null) return false;
 
         return method.getClass().getSimpleName().equals("AllCapsTransformationMethod");
     }
-
 }
diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # 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.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 20 10:05:09 MSK 2018
+#Tue Oct 16 18:21:13 CEST 2018
 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-4.10.2-all.zip

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,6 @@ android {`
`10`	`10`	`targetSdkVersion rootProject.targetSdkVersion`
`11`	`11`	`versionCode 1`
`12`	`12`	`versionName "1.0"`
`13`		`-`
`14`		`- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`15`		`-`
`16`	`13`	`}`
`17`	`14`
`18`	`15`	`buildTypes {`
`@@ -21,10 +18,9 @@ android {`
`21`	`18`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`22`	`19`	`}`
`23`	`20`	`}`
`24`		`-`
`25`	`21`	`}`
`26`	`22`
`27`	`23`	`dependencies {`
`28`	`24`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`29`		`- compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"`
	`25`	`+ compileOnly "androidx.appcompat:appcompat:$appCompatLibraryVersion"`
`30`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-<manifest xmlns:android="http://schemas.android.com/apk/res/android"`
`2`		`- package="com.omega_r.libs.centericonbutton" />`
	`1`	`+<manifest package="com.omega_r.libs.centericonbutton" />`