Skip to content

Commit 8cfde23

Browse files
fix: revert java 21 upgrade
this will be tackled connector down, these plugins will be the last to be updated
1 parent 3d83941 commit 8cfde23

8 files changed

Lines changed: 77 additions & 73 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v3
17-
- name: Set up JDK 21
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '21'
20+
java-version: '17'
2121
distribution: 'temurin'
2222
- name: Build with Gradle
2323
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee

.vogue.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1+
---
12
packageRules:
2-
-
3-
package: "com.github.mxenabled.binks"
4-
rules:
5-
major:
6-
requireLatest: false
7-
minor:
8-
requireLatest: false
9-
patch:
10-
requireLatest: false
3+
- package: "com.github.mxenabled.binks"
4+
rules:
5+
major:
6+
maxDiff: 0
7+
requireLatest: false
8+
minor:
9+
maxDiff: 0
10+
requireLatest: false
11+
micro:
12+
maxDiff: 0
13+
requireLatest: false
14+
- package: "com.github.mxenabled.coppuccino:com.github.mxenabled.coppuccino.gradle.plugin"
15+
rules: {}
16+
suppressUntil: "2026-03-02"
17+
- package: "com.github.mxenabled.vogue:com.github.mxenabled.vogue.gradle.plugin"
18+
rules: {}
19+
suppressUntil: "2026-03-02"

build.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
plugins {
4-
id "com.github.mxenabled.coppuccino" version "6.+"
5-
id "com.github.mxenabled.vogue" version "3.+"
4+
id "com.github.mxenabled.coppuccino" version "5.+"
5+
id "com.github.mxenabled.vogue" version "2.+"
66
id "groovy"
77
id "java"
88
id "maven-publish"
@@ -12,12 +12,8 @@ plugins {
1212

1313
group "com.mx.binks"
1414
version "3.0.0"
15-
16-
java {
17-
toolchain {
18-
languageVersion = JavaLanguageVersion.of(21)
19-
}
20-
}
15+
sourceCompatibility = JavaVersion.VERSION_17
16+
targetCompatibility = JavaVersion.VERSION_17
2117

2218
repositories {
2319
mavenCentral()
@@ -30,7 +26,8 @@ dependencies {
3026
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
3127
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
3228

33-
testImplementation "org.mockito:mockito-core:5.21.0"
29+
// Unit tests
30+
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
3431
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3532
}
3633

@@ -49,19 +46,19 @@ gradlePlugin {
4946

5047
kotlin {
5148
compilerOptions {
52-
jvmTarget = JvmTarget.JVM_21
49+
jvmTarget = JvmTarget.JVM_17
5350
}
5451
}
5552

5653
coppuccino {
5754
kotlin {
58-
required = true
55+
enabled = true
5956
}
6057
}
6158

6259
test { useJUnitPlatform() }
6360

6461
wrapper {
65-
gradleVersion = "8.14.3"
62+
gradleVersion = "7.6.4"
6663
distributionType = Wrapper.DistributionType.ALL
6764
}

gradle.lockfile

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
4040
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
4141
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4242
jaxen:jaxen:2.0.0=spotbugs
43-
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
44-
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43+
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
44+
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4545
net.sf.saxon:Saxon-HE:12.9=spotbugs
4646
org.apache.bcel:bcel:6.11.0=spotbugs
4747
org.apache.commons:commons-lang3:3.19.0=spotbugs
4848
org.apache.commons:commons-text:1.14.0=spotbugs
4949
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
5050
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
51-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
51+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
5252
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5353
org.dom4j:dom4j:2.2.0=spotbugs
5454
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55-
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
56-
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
57-
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
58-
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
55+
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
56+
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
57+
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
58+
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
5959
org.jcommander:jcommander:1.85=detekt
6060
org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
6161
org.jetbrains.kotlin:kotlin-build-common:2.1.0=kotlinBuildToolsApiClasspath
@@ -90,25 +90,33 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
9090
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
9191
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
9292
org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
93+
org.junit.jupiter:junit-jupiter-api:5.8.2=testRuntimeOnlyDependenciesMetadata
94+
org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeOnlyDependenciesMetadata
9395
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
96+
org.junit.platform:junit-platform-commons:1.8.2=testRuntimeOnlyDependenciesMetadata
9497
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
98+
org.junit.platform:junit-platform-engine:1.8.2=testRuntimeOnlyDependenciesMetadata
9599
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
96100
org.junit:junit-bom:5.14.0=spotbugs
97-
org.mockito:mockito-core:5.21.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
101+
org.junit:junit-bom:5.8.2=testRuntimeOnlyDependenciesMetadata
102+
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
103+
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
98104
org.objenesis:objenesis:3.3=testRuntimeClasspath
105+
org.opentest4j:opentest4j:1.2.0=testRuntimeOnlyDependenciesMetadata
99106
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
107+
org.ow2.asm:asm-analysis:9.2=jacocoAnt
100108
org.ow2.asm:asm-analysis:9.9=spotbugs
101-
org.ow2.asm:asm-commons:9.8=jacocoAnt
109+
org.ow2.asm:asm-commons:9.2=jacocoAnt
102110
org.ow2.asm:asm-commons:9.9=spotbugs
103-
org.ow2.asm:asm-tree:9.8=jacocoAnt
111+
org.ow2.asm:asm-tree:9.2=jacocoAnt
104112
org.ow2.asm:asm-tree:9.9=spotbugs
105113
org.ow2.asm:asm-util:9.9=spotbugs
106-
org.ow2.asm:asm:9.8=jacocoAnt
114+
org.ow2.asm:asm:9.2=jacocoAnt
107115
org.ow2.asm:asm:9.9=spotbugs
108116
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
109117
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
110118
org.snakeyaml:snakeyaml-engine:2.7=detekt
111119
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
112120
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
113121
org.xmlresolver:xmlresolver:5.3.3=spotbugs
114-
empty=annotationProcessor,apiDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
122+
empty=annotationProcessor,apiDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions

gradle/wrapper/gradle-wrapper.jar

17.4 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
44
networkTimeout=10000
5-
validateDistributionUrl=true
65
zipStoreBase=GRADLE_USER_HOME
76
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)