Skip to content

Commit 7542ea2

Browse files
committed
升级构建
1 parent 375c6f5 commit 7542ea2

File tree

9 files changed

+31
-30
lines changed

9 files changed

+31
-30
lines changed

app/build.gradle.kts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
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(36) {
10+
minorApiLevel = 1
11+
}
1112
}
1213

1314
defaultConfig {
@@ -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"
@@ -51,11 +48,11 @@ dependencies {
5148
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
5249
implementation("androidx.core:core-ktx:1.17.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.12.4")
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")
6158
implementation("io.github.takwolf.android.insetswidget:insetswidget:0.0.1")
@@ -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.1.0" apply false
3+
id("com.google.devtools.ksp") version "2.3.6" 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
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/10fc3bf1ee0001078a473afe6e43cfdb/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/9c55677aff3966382f3d853c0959bfb2/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fddf6293b7b991bd01fa68e5b2eab7ec/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ac151d55def6b6a9a159dc4cb4642851/redirect
12+
toolchainVendor=JETBRAINS
13+
toolchainVersion=21

gradle/wrapper/gradle-wrapper.jar

2.35 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

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

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ pluginManagement {
66
}
77
}
88

9+
plugins {
10+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
11+
}
12+
913
dependencyResolutionManagement {
1014
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1115
repositories {

0 commit comments

Comments
 (0)