Skip to content

Commit

Permalink
update to gradle 8.7 (#112)
Browse files Browse the repository at this point in the history
  • Loading branch information
ToppleTheNun authored May 21, 2024
1 parent b77ea20 commit 8da1c9c
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": ["github>MythicDrops/.github"]
"extends": ["config:best-practices"]
}
1 change: 0 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
build:
runs-on: ubuntu-latest
needs: [ gradle_wrapper_validation ]
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
permissions:
contents: write
issues: write
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
# Trigger mega-linter at every push. Action will also be visible from Pull Requests to master
push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions)
pull_request:
branches: [master, main]
branches: [main]

env: # Comment env block if you do not want to apply fixes
# Apply linter fixes configuration
Expand All @@ -17,7 +17,7 @@ env: # Comment env block if you do not want to apply fixes
APPLY_FIXES_MODE: pull_request # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) or posted in a PR (pull_request)

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
group: "${{ github.ref }}-${{ github.workflow }}"
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

# Upload MegaLinter artifacts
- name: Archive production artifacts
if: ${{ success() }} || ${{ failure() }}
if: success() || failure()
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4
with:
name: MegaLinter reports
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 0 additions & 3 deletions renovate.json

This file was deleted.

4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ pluginManagement {

plugins {
// See https://jmfayard.github.io/refreshVersions
id("de.fayard.refreshVersions") version "0.60.3"
id("com.gradle.enterprise") version "3.16.2"
id("de.fayard.refreshVersions") version "0.60.5"
id("com.gradle.enterprise") version "3.17.4"
}

gradleEnterprise {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ open class MythicDropsJavaPlugin : DependentPlugin("Java", "java") {
// enable and configure JaCoCo
target.pluginManager.apply(JacocoPlugin::class.java)
target.configure<JacocoPluginExtension> {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}
target.tasks.withType<JacocoReport> {
reports {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.jlleitschuh.gradle.ktlint.KtlintExtension
import org.jlleitschuh.gradle.ktlint.KtlintPlugin

/**
* Plugin that configures Kotlin for JDK 17, enables Detekt, and enables/configures KTLint to use 1.1.1.
* Plugin that configures Kotlin for JDK 17, enables Detekt, and enables/configures KTLint to use 1.2.1.
*/
open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbrains.kotlin.jvm") {
override fun configureProject(target: Project) {
Expand All @@ -24,7 +24,7 @@ open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbr

// exclude files from the build directory from being linted or formatted
target.configure<KtlintExtension> {
version.set("1.1.1")
version.set("1.2.1")
filter {
exclude { entry ->
entry.file.toString().contains("generated")
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=7.1.*
version=7.2.*
28 changes: 14 additions & 14 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.60.3
#### Generated by `./gradlew refreshVersions` version 0.60.5
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
Expand All @@ -9,39 +9,39 @@

plugin.com.gradle.plugin-publish=1.2.1

plugin.io.gitlab.arturbosch.detekt=1.23.4
plugin.io.gitlab.arturbosch.detekt=1.23.6

plugin.org.jetbrains.dokka=1.9.10
plugin.org.jetbrains.dokka=1.9.20

plugin.org.jlleitschuh.gradle.ktlint=12.1.0
## # available=12.1.1

plugin.org.shipkit.shipkit-auto-version=2.0.3
plugin.org.shipkit.shipkit-auto-version=2.0.7

plugin.org.shipkit.shipkit-changelog=2.0.1

plugin.org.shipkit.shipkit-github-release=2.0.1

plugin.com.adarshr.test-logger=4.0.0

version.org.shipkit..shipkit-auto-version=2.0.3
version.org.shipkit..shipkit-auto-version=2.0.7

version.org.shipkit..shipkit-changelog=2.0.1

version.com.adarshr..gradle-test-logger-plugin=4.0.0

version.org.jetbrains.dokka..dokka-core=1.9.10
version.org.jetbrains.dokka..dokka-core=1.9.20

version.org.jetbrains.dokka..dokka-gradle-plugin=1.9.10
version.org.jetbrains.dokka..dokka-gradle-plugin=1.9.20

version.com.netflix.nebula..nebula-project-plugin=10.1.5
version.com.netflix.nebula..nebula-project-plugin=11.0.0

version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.23.4
version.io.gitlab.arturbosch.detekt..detekt-gradle-plugin=1.23.6

version.org.jlleitschuh.gradle..ktlint-gradle=12.1.0
version.org.jlleitschuh.gradle..ktlint-gradle=12.1.1

version.io.github.gradle-nexus..publish-plugin=1.3.0
## # available=2.0.0-rc-1
version.io.github.gradle-nexus..publish-plugin=2.0.0

version.org.kohsuke..github-api=1.318
version.org.kohsuke..github-api=1.321

version.io.github.patrick-choe..mojang-spigot-remapper=1.4.0
version.io.github.patrick-choe..mojang-spigot-remapper=1.4.2

0 comments on commit 8da1c9c

Please sign in to comment.