Remove jcenter/bintray dependence and add support for maven central

Author: yongce

.idea/compiler.xml

@@ -1,7 +1,7 @@
 /*
  * File: 'android_module_common.gradle'
  * Location: https://raw.githubusercontent.com/yongce/AndroidLib/master/android_module_common.gradle
- * Version: 2020.03.26
+ * Version: 2021.10.1
  * All android projects can copy and include this file.
  */
 

.idea/jarRepositories.xml

@@ -1,7 +1,7 @@
 /*
  * File: 'android_project_common.gradle'
  * Location: https://raw.githubusercontent.com/yongce/AndroidLib/master/android_project_common.gradle
- * Version: 2020.08.22
+ * Version: 2021.10.1
  * All android projects can copy and include this file.
  */
 
@@ -35,7 +35,7 @@ ext {
 
     versions = [
             // compile
-            'compileSdk'       : 30,
+            'compileSdk'       : 31,
 
             // Android official support
             'kotlin'           : '1.5.31',
@@ -91,7 +91,7 @@ ext {
             'okhttp'           : '4.9.0',
             'retrofit'         : '2.9.0',
             'glide'            : '4.11.0',
-            'glideTrans'       : "4.0.0",
+            'glideTrans'       : "4.3.0",
 
             // rx
             'rxjava'           : "2.2.12",
@@ -276,7 +276,7 @@ ext {
             'glideTrans'               : "jp.wasabeef:glide-transformations:${versions.glideTrans}",
 
             // UI
-            'flexbox'                  : "com.google.android:flexbox:2.0.1",
+            'flexbox'                  : "com.google.android.flexbox:flexbox:3.0.0",
             'lottie'                   : "com.airbnb.android:lottie:3.4.4",
 
             // rx
@@ -287,10 +287,10 @@ ext {
 
             // ycdev
             'ycdev': [
-                    'androidBase'      : "me.ycdev.android:common-base:${versions.androidLib}",
-                    'androidArch'      : "me.ycdev.android:common-arch:${versions.androidLib}",
-                    'androidUi'        : "me.ycdev.android:common-ui:${versions.androidLib}",
-                    'androidTest'      : "me.ycdev.android:common-test:${versions.androidLib}"
+                    'androidBase'      : "io.github.yongce:android-common-base:${versions.androidLib}",
+                    'androidArch'      : "io.github.yongce:android-common-arch:${versions.androidLib}",
+                    'androidUi'        : "io.github.yongce:android-common-ui:${versions.androidLib}",
+                    'androidTest'      : "io.github.yongce:android-common-test:${versions.androidLib}"
             ],
 
             // others

.idea/misc.xml

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "me.ycdev.android.arch.demo"
         minSdkVersion versions.minSdk
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -97,7 +97,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}"
 
     implementation "com.google.zxing:core:${versions.zxing}"
-    implementation "com.google.android:flexbox:2.0.1"
+    implementation "com.google.android.flexbox:flexbox:3.0.0"
     implementation "com.airbnb.android:lottie:3.4.4"
 
     testImplementation "androidx.test:core:${versions.testCore}"

android_module_common.gradle

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.ycdev.android.arch.demo" >
+    xmlns:tools="http://schemas.android.com/tools"
+    package="me.ycdev.android.arch.demo">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="MediaCapabilities">
         <activity
             android:name=".activity.LintGoodActivity"
             android:label="@string/title_activity_lint_good"

android_project_common.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply from: "${androidModuleCommon}"
 apply from: '../build_common.gradle'
 
-project.archivesBaseName = 'common-base'
+project.archivesBaseName = 'android-common-base'
 
 android {
     defaultConfig {
@@ -47,7 +47,6 @@ project.ext {
     moduleDesc = 'Common basic module in AndroidLib project'
 }
 
-if (bintrayUploadEnabled) {
-    apply from: rootProject.file('bintray-install.gradle')
-    apply from: rootProject.file('bintray-upload.gradle')
+if (publishEnabled) {
+    apply from: rootProject.file('publish-module.gradle')
 }

archLintRulesTestDemo/build.gradle

@@ -1,5 +1,6 @@
 package me.ycdev.android.lib.common.activity
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
@@ -12,6 +13,7 @@ import java.util.concurrent.atomic.AtomicInteger
  * This class can be used to track Activity/task state changes.
  * We can use it in instrumentation test cases to check Activity/task related design/logic.
  */
+@SuppressLint("StaticFieldLeak")
 object ActivityTaskTracker {
     private const val TAG = "ActivityTaskTracker"
 
@@ -27,6 +29,7 @@ object ActivityTaskTracker {
     private var totalActivitiesCount = AtomicInteger(0)
 
     private var focusedTaskId: Int = -1
+    @SuppressLint("StaticFieldLeak")
     private var resumedActivity: Activity? = null
 
     private var debugLog: Boolean = false

archLintRulesTestDemo/src/main/AndroidManifest.xml

@@ -309,7 +309,7 @@ abstract class ServiceConnector<IServiceInterface> protected constructor(
         private const val MSG_CONNECT_TIMEOUT_CHECK = 3
 
         private const val CONNECT_TIMEOUT_CHECK_INTERVAL: Long = 5000 // 5s
-        private const val FORCE_REBIND_TIME: Long = 30 * 1000 // 30 seconds
+        private const val FORCE_REBIND_TIME: Long = 30 * 1000L // 30 seconds
 
         fun strConnectState(state: Int): String {
             return when (state) {

baseLib/build.gradle

@@ -7,42 +7,41 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
-// Add plugin for 'spotless'
 plugins {
-    id "com.diffplug.spotless" version "5.11.0"
+    id("com.diffplug.spotless") version "5.11.0"
+    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("org.jetbrains.dokka") version "1.5.30"
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 ext {
     versions.ndkVersion = "21.3.6528147"
 
-    bintrayUploadEnabled = true
-    bintrayMaven = [
-            'projectRepo': 'android',
+    publishEnabled = true
+    mavenMeta = [
+            'name': 'AndroidLib',
+            'description': 'Android libraries',
             'projectUrl': 'https://github.com/yongce/AndroidLib',
             'projectScmConnection': 'https://github.com/yongce/AndroidLib.git',
             'projectScmDevConnection': 'ssh://[email protected]/yongce/AndroidLib.git',
             'projectInceptionYear': '2013',
-            'groupId': 'me.ycdev.android',
-            'version': '1.8.5',
+            'groupId': 'io.github.yongce',
+            'version': '2.0.0',
             'developerId': 'yongce',
             'developerName': 'Yongce Tu',
             'developerEmail': '[email protected]',
@@ -64,4 +63,5 @@ spotless {
     }
 }
 
+apply from: "${rootDir}/publish-root.gradle"
 apply plugin: 'android-reporting'