Skip to content

Commit 2a39d90

Browse files
committed
升级依赖
1 parent 56aff03 commit 2a39d90

8 files changed

Lines changed: 33 additions & 58 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v6
14+
uses: actions/checkout@v6.0.2
1515
- name: Setup Java
16-
uses: actions/setup-java@v5
16+
uses: actions/setup-java@v5.2.0
1717
with:
1818
java-version: "21"
1919
distribution: "temurin"

app/build.gradle.kts

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
plugins {
22
id("com.android.application")
3-
id("org.jetbrains.kotlin.android")
43
id("com.google.devtools.ksp")
54
}
65

76
android {
87
namespace = "com.takwolf.android.demo.refreshandloadmore"
98
compileSdk {
10-
version = release(36)
9+
version = release(37) {
10+
minorApiLevel = 0
11+
}
1112
}
1213

1314
defaultConfig {
1415
applicationId = "com.takwolf.android.demo.refreshandloadmore"
1516
minSdk = 23
16-
targetSdk = 36
17+
targetSdk = 37
1718
versionCode = 1
1819
versionName = "0.0.1"
1920
}
@@ -30,15 +31,11 @@ android {
3031
}
3132

3233
compileOptions {
33-
sourceCompatibility = JavaVersion.VERSION_1_8
34-
targetCompatibility = JavaVersion.VERSION_1_8
34+
sourceCompatibility = JavaVersion.VERSION_11
35+
targetCompatibility = JavaVersion.VERSION_11
3536
isCoreLibraryDesugaringEnabled = true
3637
}
3738

38-
kotlinOptions {
39-
jvmTarget = "1.8"
40-
}
41-
4239
packaging {
4340
resources {
4441
excludes += "DebugProbesKt.bin"
@@ -49,18 +46,18 @@ android {
4946
dependencies {
5047
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
5148
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
52-
implementation("androidx.core:core-ktx:1.17.0")
49+
implementation("androidx.core:core-ktx:1.18.0")
5350
implementation("androidx.appcompat:appcompat:1.7.1")
54-
implementation("androidx.activity:activity-ktx:1.12.0")
51+
implementation("androidx.activity:activity-ktx:1.13.0")
5552
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0")
5653
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.10.0")
5754
implementation("androidx.recyclerview:recyclerview:1.4.0")
58-
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
55+
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0")
5956
implementation("androidx.constraintlayout:constraintlayout:2.2.1")
6057
implementation("androidx.cardview:cardview:1.0.0")
61-
implementation("io.github.takwolf.android.insetswidget:insetswidget:0.0.1")
62-
implementation("io.github.takwolf.android.hfrecyclerview:hfrecyclerview:0.0.2")
63-
implementation("io.github.takwolf.android.hfrecyclerview:paging:0.0.2")
58+
implementation("io.github.takwolf.android.insetswidget:insetswidget:0.0.2")
59+
implementation("io.github.takwolf.android.hfrecyclerview:hfrecyclerview:0.0.3")
60+
implementation("io.github.takwolf.android.hfrecyclerview:paging:0.0.3")
6461
implementation("de.hdodenhof:circleimageview:3.1.0")
6562
implementation("com.squareup.moshi:moshi:1.15.2")
6663
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.2")
@@ -69,6 +66,6 @@ dependencies {
6966
implementation("com.squareup.okhttp3:logging-interceptor")
7067
implementation("com.squareup.retrofit2:retrofit:3.0.0")
7168
implementation("com.squareup.retrofit2:converter-moshi:3.0.0")
72-
implementation("io.coil-kt.coil3:coil:3.3.0")
73-
implementation("io.coil-kt.coil3:coil-network-okhttp:3.3.0")
69+
implementation("io.coil-kt.coil3:coil:3.4.0")
70+
implementation("io.coil-kt.coil3:coil-network-okhttp:3.4.0")
7471
}

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id("com.android.application") version "8.13.1" apply false
3-
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
4-
id("com.google.devtools.ksp") version "2.3.3" apply false
2+
id("com.android.application") version "9.2.0" apply false
3+
id("com.google.devtools.ksp") version "2.3.7" apply false
54
}

gradle.properties

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1111
# This option should only be used with decoupled projects. For more details, visit
1212
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
1313
# org.gradle.parallel=true
14-
# AndroidX package structure to make it clearer which packages are bundled with the
15-
# Android operating system, and which are packaged with your app's APK
16-
# https://developer.android.com/topic/libraries/support-library/androidx-rn
17-
android.useAndroidX=true
1814
# Kotlin code style for this project: "official" or "obsolete":
1915
kotlin.code.style=official
20-
# Enables namespacing of each library's R class so that its R class includes only the
21-
# resources declared in the library itself and none from the library's dependencies,
22-
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.jar

4.59 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 10 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)