Switch repository to MavenCentral && Optimized performance

Author: dkzwm

README.md

@@ -20,12 +20,8 @@
 ## 引入
 添加如下依赖到你的 build.gradle 文件:
 ```
-repositories {
-    ...
-    maven { url 'https://jitpack.io' }
-}
 dependencies {
-    implementation 'com.github.dkzwm:FormatEditText:0.2.0'
+    implementation 'com.github.dkzwm:fet-core:0.2.1'
 }
 ```
 ## 使用

README_EN.md

@@ -20,12 +20,8 @@ Download [Demo.apk](https://github.com/dkzwm/FormatEditText/raw/master/apk/demo.
 ## Installation
 Add the following dependency to your build.gradle file:
 ```
-repositories {
-    ...
-    maven { url 'https://jitpack.io' }
-}
 dependencies {
-    implementation 'com.github.dkzwm:FormatEditText:0.2.0'
+    implementation 'com.github.dkzwm:fet-core:0.2.1'
 }
 ```
 ## How to used

apk/demo.apk

@@ -21,5 +21,5 @@ android {
 
 dependencies {
     implementation project(':core')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
 }

app/build.gradle

@@ -1,19 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         jcenter()
-        maven { url 'https://jitpack.io' }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
 plugins {
-    id "com.diffplug.gradle.spotless" version "3.25.0"
+    id "com.diffplug.spotless" version "5.3.0"
 }
 
 allprojects {
@@ -25,8 +24,8 @@ allprojects {
 }
 
 subprojects {
+    apply plugin: 'com.diffplug.spotless'
     if (it.name != 'app') {
-        apply plugin: 'com.diffplug.gradle.spotless'
         spotless {
             java {
                 target fileTree('.') {
@@ -37,7 +36,6 @@ subprojects {
             }
         }
     } else {
-        apply plugin: 'com.diffplug.gradle.spotless'
         spotless {
             java {
                 target '**/*.java'
@@ -47,19 +45,20 @@ subprojects {
     }
 }
 
+
 ext {
     android = [
-            compileSdkVersion: 29,
-            buildToolsVersion: "29.0.3",
+            compileSdkVersion: 30,
+            buildToolsVersion: "30.0.3",
             minSdkVersion    : 14,
-            targetSdkVersion : 29,
-            versionCode      : 14,
-            versionName      : "0.2.0"
+            targetSdkVersion : 30,
+            versionCode      : 15,
+            versionName      : "0.2.1"
     ]
     bintray = [
             siteUrl       : 'https://github.com/dkzwm/FormatEditText',
             gitUrl        : 'https://github.com/dkzwm/FormatEditText.git',
-            groupId       : "me.dkzwm.widget.fet",
+            groupId       : "com.github.dkzwm",
             libVersion    : android.versionName,
             developerId   : "dkzwm",
             developerName : "Zhang Weiming",

build.gradle

@@ -1,9 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-group = rootProject.ext.bintray['groupId']
-version=rootProject.ext.android['versionName']
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -24,24 +22,25 @@ android {
 }
 
 dependencies {
-    compileOnly 'androidx.appcompat:appcompat:1.1.0'
+    compileOnly 'androidx.appcompat:appcompat:1.3.1'
 }
 
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
     failOnError false
+    options.encoding = 'UTF-8'
     source = android.sourceSets.main.java.sourceFiles
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     classpath += configurations.compile
 }
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 
@@ -58,8 +57,8 @@ install {
                 name 'FormatEditText-Core'
                 groupId rootProject.ext.bintray['groupId']
                 url rootProject.ext.bintray['siteUrl']
-                artifactId 'core'
-                description 'FormatEditText can be used as a number formatted text input box.'
+                artifactId 'fet-core'
+                description 'FormatEditText can be used as a formatted text input box.'
                 licenses {
                     license {
                         name rootProject.ext.bintray['licenseName']
@@ -83,21 +82,66 @@ install {
     }
 }
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+signing {
+    sign publishing.publications
+}
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId rootProject.ext.bintray['groupId']
+            artifactId 'fet-core'
+            version rootProject.ext.bintray['libVersion']
 
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.key")
+            artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
+            artifact sourcesJar
+            artifact javadocJar
 
-    configurations = ['archives']
-    pkg {
-        repo = 'maven-fet'
-        name = 'core'
-        desc = 'FormatEditText can be used as a number formatted text input box.'
-        websiteUrl = rootProject.ext.bintray['siteUrl']
-        vcsUrl = rootProject.ext.bintray['gitUrl']
-        licenses = rootProject.ext.allLicenses
-        publish = true
+            pom {
+                name = 'fet-core'
+                description = 'FormatEditText can be used as a formatted text input box.'
+                url = rootProject.ext.bintray['siteUrl']
+                licenses {
+                    license {
+                        name = rootProject.ext.bintray['licenseName']
+                        url = rootProject.ext.bintray['licenseUrl']
+                    }
+                }
+                developers {
+                    developer {
+                        id = rootProject.ext.bintray['developerId']
+                        name = rootProject.ext.bintray['developerName']
+                        email = rootProject.ext.bintray['developerEmail']
+                    }
+                }
+                scm {
+                    connection = rootProject.ext.bintray['gitUrl']
+                    developerConnection = rootProject.ext.bintray['gitUrl']
+                    url = rootProject.ext.bintray['siteUrl']
+                }
+                withXml {
+                    def dependenciesNode = asNode().appendNode('dependencies')
+
+                    project.configurations.implementation.allDependencies.each {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', it.group)
+                        dependencyNode.appendNode('artifactId', it.name)
+                        dependencyNode.appendNode('version', it.version)
+                    }
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            name = "sonatype"
+            url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            credentials {
+                Properties properties = new Properties()
+                properties.load(project.rootProject.file('local.properties').newDataInputStream())
+                username = properties.getProperty("bintray.user")
+                password = properties.getProperty("bintray.key")
+            }
+        }
     }
 }

core/build.gradle

@@ -339,7 +339,7 @@ private void formatNumber(final Editable editable) {
         if (spans.length > 0) {
             DecimalPointSpan span = spans[0];
             int start = editable.getSpanStart(span);
-            int index = editable.toString().indexOf(DECIMAL_POINT_CHAR);
+            int index = indexOfDecimalPointChar(editable);
             if (index != start) {
                 editable.delete(start, start + 1);
                 span = new DecimalPointSpan(getCurrentTextColor());
@@ -369,7 +369,7 @@ private void formatNumber(final Editable editable) {
                 }
             }
         } else {
-            int index = editable.toString().indexOf(DECIMAL_POINT_CHAR);
+            int index = indexOfDecimalPointChar(editable);
             if (index == -1) {
                 formatInteger(editable, editable.length());
                 if (mAutoFillNumbers && mDecimalLength > 0) {
@@ -389,12 +389,22 @@ private void formatNumber(final Editable editable) {
                         index + 1,
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                 formatInteger(editable, index);
-                formatDecimal(editable, editable.toString().indexOf(DECIMAL_POINT_CHAR));
+                formatDecimal(editable, indexOfDecimalPointChar(editable));
             }
         }
         formatCurrencySymbol(editable);
     }
 
+    private int indexOfDecimalPointChar(Editable editable) {
+        final int max = editable.length();
+        for (int i = 0; i < max; i++) {
+            if (editable.charAt(i) == DECIMAL_POINT_CHAR) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     private void formatCurrencySymbol(Editable editable) {
         if (mCurrencySymbol != null) {
             editable.insert(0, mCurrencySymbol);