Merge branch 'dev_androidx'

Author: AlexLiuSheng

build.gradle

@@ -1,37 +1,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = "1.4.0"
+    ext.kotlin_version = "1.8.0"
 
     repositories {
-        jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+        google()
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
-//        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-//        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-//        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-
+        google()
 
-        }
     }
 }
 

gradle.properties

@@ -13,6 +13,9 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed Apr 18 14:01:51 CST 2018
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

library/build.gradle

@@ -1,18 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 29
+    compileSdkVersion 32
 //    buildToolsVersion "29.0.3"
     resourcePrefix "versionchecklib"
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 29
-        versionCode 1
-        versionName version
-    }
-    lintOptions {
-        abortOnError false
+        minSdkVersion 21
+        targetSdkVersion 32
     }
 
     buildTypes {
@@ -22,12 +17,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.allenliu.versionchecklib'
+    lint {
+        abortOnError false
+    }
+    compileOptions {
+        targetCompatibility  JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    compileOnly 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.3.1'
-    implementation 'org.greenrobot:eventbus:3.1.1'
-
+    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'org.greenrobot:eventbus:3.3.1'
+    implementation "androidx.annotation:annotation:1.6.0"
 }

library/src/main/AndroidManifest.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.allenliu.versionchecklib">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -15,10 +13,7 @@
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
         android:usesCleartextTraffic="true">
-        <activity
-            android:name=".core.VersionDialogActivity"
-            android:launchMode="singleTask"
-            android:theme="@style/versionCheckLibvtransparentTheme" />
+
 
         <provider
             android:name=".core.VersionFileProvider"
@@ -31,15 +26,11 @@
         </provider>
 
         <activity
-            android:name=".core.PermissionDialogActivity"
+            android:name=".core.JumpActivity"
             android:launchMode="singleTask"
             android:theme="@style/versionCheckLibvtransparentTheme" />
 
-        <service
-            android:name=".core.MyService"
-            android:enabled="true"
 
-            android:exported="false" />
         <service
             android:name=".v2.ui.VersionService"
             android:exported="false"
@@ -56,7 +47,7 @@
         <activity
             android:name=".v2.ui.DownloadFailedActivity"
             android:launchMode="singleTask"
-            android:theme="@style/versionCheckLibvtransparentTheme"></activity>
+            android:theme="@style/versionCheckLibvtransparentTheme" />
     </application>
 
 </manifest>