升级版本号

GuoYangGit · Apr 15, 2024 · 12090e0 · 12090e0
1 parent 1e9567b
commit 12090e0
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 61 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.guoyang.androidutils'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
         applicationId "com.guoyang.androidutils"
-        minSdk 21
-        targetSdk 33
+        minSdk min_sdk
+        targetSdk compile_sdk
         versionCode 1
         versionName "1.0"
 
@@ -40,11 +40,11 @@ dependencies {
     api project(path: ':xloghelper')
     api project(path: ':utils-helper')
     api project(path: ':viewbinding-helper')
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/base/build.gradle b/base/build.gradle
@@ -12,11 +12,11 @@ dokkaHtml {
 
 android {
     namespace 'com.guoyang.base'
-    compileSdkVersion 33
+    compileSdkVersion compile_sdk
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk min_sdk
+        targetSdk compile_sdk
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // 开启module混淆
         consumerProguardFiles "consumer-rules.pro"
@@ -27,18 +27,18 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     //androidx
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     //kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20"
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation "androidx.fragment:fragment-ktx:1.5.3"
+    implementation "androidx.fragment:fragment-ktx:1.5.6"
 
     //lifecycle
-    def lifecycleVersion = '2.5.1'
+    def lifecycleVersion = '2.7.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:${lifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-common-java8:${lifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${lifecycleVersion}"

diff --git a/base/src/main/java/com/guoyang/base/BaseApp.kt b/base/src/main/java/com/guoyang/base/BaseApp.kt
@@ -5,8 +5,7 @@ import android.content.Context
 import androidx.multidex.MultiDex
 
 /**
- * 提供基类的Application
- * @author Yang.Guo on 2021/5/31.
+ * 提供基类的[Application]
  */
 open class BaseApp : Application() {
 

diff --git a/base/src/main/java/com/guoyang/base/event/EventLiveData.kt b/base/src/main/java/com/guoyang/base/event/EventLiveData.kt
@@ -4,7 +4,6 @@ import com.kunminx.architecture.ui.callback.UnPeekLiveData
 
 /**
  * 解决数据倒灌的LiveData，可以用来做事件订阅
- * @author Yang.Guo on 2021/6/3.
  * ```
  * val eventLiveData = EventLiveData<String>()
  * // 发送事件

diff --git a/base/src/main/java/com/guoyang/base/state/UiState.kt b/base/src/main/java/com/guoyang/base/state/UiState.kt
@@ -2,7 +2,6 @@ package com.guoyang.base.state
 
 /**
  * 数据和UI相关的状态类
- * @author Yang.Guo on 2021/6/3.
  */
 sealed class UiState<out T> {
     companion object {

diff --git a/base/src/main/java/com/guoyang/base/ui/ILoading.kt b/base/src/main/java/com/guoyang/base/ui/ILoading.kt
@@ -2,7 +2,6 @@ package com.guoyang.base.ui
 
 /**
  * 加载框接口
- * @author yang.guo on 2022/10/26
  */
 interface ILoading {
     /**

diff --git a/base/src/main/java/com/guoyang/base/ui/IView.kt b/base/src/main/java/com/guoyang/base/ui/IView.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 
 /**
  * Activity、Fragment的基类接口
- * @author Yang.Guo on 2021/6/3.
  */
 interface IView {
     /**

diff --git a/base/src/main/java/com/guoyang/base/ui/activity/BaseActivity.kt b/base/src/main/java/com/guoyang/base/ui/activity/BaseActivity.kt
@@ -5,8 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.guoyang.base.ui.IView
 
 /**
- * 通用的[Activity]基类
- * @author Yang.Guo on 2021/6/3.
+ * 通用的[AppCompatActivity]基类
  */
 abstract class BaseActivity : AppCompatActivity(), IView {
 

diff --git a/base/src/main/java/com/guoyang/base/ui/fragment/BaseFragment.kt b/base/src/main/java/com/guoyang/base/ui/fragment/BaseFragment.kt
@@ -8,8 +8,7 @@ import androidx.fragment.app.Fragment
 import com.guoyang.base.ui.IView
 
 /**
- * 通用的Fragment基类
- * @author Yang.Guo on 2021/6/3.
+ * 通用的[Fragment]基类
  */
 abstract class BaseFragment : Fragment(), IView {
 

diff --git a/base/src/main/java/com/guoyang/base/weight/NestedScrollableHost.kt b/base/src/main/java/com/guoyang/base/weight/NestedScrollableHost.kt
@@ -6,14 +6,14 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
 import android.widget.FrameLayout
+import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import androidx.viewpager2.widget.ViewPager2.ORIENTATION_HORIZONTAL
 import kotlin.math.absoluteValue
 import kotlin.math.sign
 
 /**
- * 此类用于解决 ViewPager2  嵌套 ViewPager2 或者 RecyclerView 等相互嵌套的冲突问题
- * @author yang.guo on 2022/10/25
+ * 此类用于解决 [ViewPager2]  嵌套 [ViewPager2] 或者 [RecyclerView] 等相互嵌套的冲突问题
  */
 class NestedScrollableHost : FrameLayout {
     constructor(context: Context) : super(context)

diff --git a/base/src/main/java/com/guoyang/base/weight/decoration/DefaultDecoration.kt b/base/src/main/java/com/guoyang/base/weight/decoration/DefaultDecoration.kt
@@ -22,7 +22,6 @@ import kotlin.math.roundToInt
 
 /**
  * 最强大的分割线工具
- * @author yang.guo on 2022/10/25
  * 1. 分隔图片
  * 2. 分隔颜色
  * 3. 分隔间距

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,14 @@
 buildscript {
+    ext.compile_sdk = 34
+    ext.min_sdk = 21
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 android.enableJetifier=true
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+kotlin.code.style=official
diff --git a/utils-helper/build.gradle b/utils-helper/build.gradle
@@ -12,11 +12,11 @@ dokkaHtml {
 
 android {
     namespace 'com.guoyang.utils_helper'
-    compileSdk 32
+    compileSdkVersion compile_sdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 32
+        minSdk min_sdk
+        targetSdk compile_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -45,13 +45,12 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.5.1'
     //lifecycle
-    def lifecycleVersion = '2.5.1'
+    def lifecycleVersion = '2.7.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:${lifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-common-java8:${lifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-process:${lifecycleVersion}"
     implementation "com.squareup.okio:okio:3.0.0"
-
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/utils-helper/src/main/java/com/guoyang/utils_helper/AppForegroundObserver.kt b/utils-helper/src/main/java/com/guoyang/utils_helper/AppForegroundObserver.kt
@@ -11,7 +11,6 @@ import androidx.lifecycle.*
  *     Log.d("AppLifeLiveData", "当前是否在前台: $it")
  * })
  * ```
- * @author Yang.Guo on 2021/5/31.
  */
 class AppForegroundObserver : LifecycleEventObserver {
     private var observer: Observer<Boolean>? = null

diff --git a/utils-helper/src/main/java/com/guoyang/utils_helper/AppInitializer.kt b/utils-helper/src/main/java/com/guoyang/utils_helper/AppInitializer.kt
@@ -8,7 +8,6 @@ import androidx.startup.Initializer
 
 /**
  * 应用初始化类，用于初始化一些上下文相关的东西
- * @author yang.guo on 2022/11/11
  */
 class AppInitializer : Initializer<Unit> {
     override fun dependencies() = emptyList<Class<Initializer<*>>>()

diff --git a/viewbinding-helper/build.gradle b/viewbinding-helper/build.gradle
@@ -12,11 +12,11 @@ dokkaHtml {
 
 android {
     namespace 'com.guoyang.viewbinding_helper'
-    compileSdk 32
+    compileSdkVersion compile_sdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 32
+        minSdk min_sdk
+        targetSdk compile_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -42,11 +42,10 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/xloghelper/build.gradle b/xloghelper/build.gradle
@@ -12,11 +12,11 @@ dokkaHtml {
 
 android {
     namespace 'com.guoyang.xloghelper'
-    compileSdk 32
+    compileSdkVersion compile_sdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 32
+        minSdk min_sdk
+        targetSdk compile_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -46,11 +46,10 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }