Skip to content

Commit 8dd0e1f

Browse files
chore: Update Gradle to version 8 + JDK to version 17 (#82)
* chore: Update Gradle to version 8 * chore: Update JDK to version 17 --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent dfac78d commit 8dd0e1f

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

.github/workflows/main-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v3
2525
with:
2626
distribution: temurin
27-
java-version: 11
27+
java-version: 17
2828

2929
- name: Setup Gradle
3030
uses: gradle/gradle-build-action@v2
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/setup-java@v3
5555
with:
5656
distribution: temurin
57-
java-version: 11
57+
java-version: 17
5858

5959
- name: Setup Gradle
6060
uses: gradle/gradle-build-action@v2

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/setup-java@v3
2121
with:
2222
distribution: temurin
23-
java-version: 11
23+
java-version: 17
2424

2525
- name: Setup Gradle
2626
uses: gradle/gradle-build-action@v2

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
- name: Gradle Wrapper Validation
3737
uses: gradle/[email protected]
3838

39-
- name: Set up JDK 11
39+
- name: Set up JDK 17
4040
uses: actions/setup-java@v3
4141
with:
42-
java-version: '11'
42+
java-version: '17'
4343
distribution: 'temurin'
4444

4545
- name: Build modules

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ config-compile-sdk-version = "33"
99
config-min-sdk-version = "23"
1010
config-target-sdk-version = "33"
1111
detektPlugin = "1.22.0"
12-
gradlePlugin = "7.3.0"
12+
gradlePlugin = "8.0.2"
1313
koin = "3.4.1"
1414
kotlin = "1.7.20"
1515
koverPlugin = "0.6.1"
@@ -19,7 +19,7 @@ mockk = "1.13.5"
1919
mockkCommon = "1.12.5"
2020
publishPlugin = "0.24.0"
2121
spmPlugin = "2.0.5-arm64"
22-
spring = "2.4.5"
22+
spring = "2.6.15"
2323

2424
[libraries]
2525
# Spring
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jan 18 16:11:19 BRT 2023
1+
#Wed Jun 07 10:12:25 BRT 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

sample/android/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ android {
2424

2525
buildFeatures {
2626
compose = true
27+
buildConfig = true
2728
}
2829

2930
composeOptions {
3031
kotlinCompilerExtensionVersion = "1.3.2"
3132
}
3233

33-
packagingOptions {
34+
packaging {
3435
resources {
3536
excludes += "/META-INF/{AL2.0,LGPL2.1}"
3637
}

ychat-core/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ android {
9999
compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
100100
defaultConfig {
101101
minSdk = libs.versions.config.min.sdk.version.get().toInt()
102-
targetSdk = libs.versions.config.target.sdk.version.get().toInt()
103102
}
104103
}
105104

ychat/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ android {
110110
compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
111111
defaultConfig {
112112
minSdk = libs.versions.config.min.sdk.version.get().toInt()
113-
targetSdk = libs.versions.config.target.sdk.version.get().toInt()
114113
}
115114
}
116115

0 commit comments

Comments
 (0)