Skip to content

chore: Update Gradle to version 8 + JDK to version 17 #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2023
Merged

chore: Update Gradle to version 8 + JDK to version 17 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9778fb8
chore: Update Gradle to version 8
xyzwilliamxyz Jun 9, 2023
8bfc558
chore: Update JDK to version 17
dependabot[bot] Jun 12, 2023
d217e7b
Merge branch 'main' into chore/upgrade-gradle
xyzwilliamxyz Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-version: 17

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.4

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Build modules
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config-compile-sdk-version = "33"
config-min-sdk-version = "23"
config-target-sdk-version = "33"
detektPlugin = "1.22.0"
gradlePlugin = "7.3.0"
gradlePlugin = "8.0.2"
koin = "3.4.1"
kotlin = "1.7.20"
koverPlugin = "0.6.1"
Expand All @@ -19,7 +19,7 @@ mockk = "1.13.5"
mockkCommon = "1.12.5"
publishPlugin = "0.24.0"
spmPlugin = "2.0.5-arm64"
spring = "2.4.5"
spring = "2.6.15"

[libraries]
# Spring
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jan 18 16:11:19 BRT 2023
#Wed Jun 07 10:12:25 BRT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion sample/android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ android {

buildFeatures {
compose = true
buildConfig = true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.3.2"
}

packagingOptions {
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
Expand Down
1 change: 0 additions & 1 deletion ychat-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ android {
compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
defaultConfig {
minSdk = libs.versions.config.min.sdk.version.get().toInt()
targetSdk = libs.versions.config.target.sdk.version.get().toInt()
}
}

Expand Down
1 change: 0 additions & 1 deletion ychat/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ android {
compileSdk = libs.versions.config.compile.sdk.version.get().toInt()
defaultConfig {
minSdk = libs.versions.config.min.sdk.version.get().toInt()
targetSdk = libs.versions.config.target.sdk.version.get().toInt()
}
}

Expand Down