Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee
Expand Down
46 changes: 25 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id "com.github.mxenabled.coppuccino" version "3.0.4"
id "com.github.mxenabled.vogue" version "1.0.1"
id "com.github.mxenabled.hush" version "2.0.1"
id "com.github.mxenabled.binks" version "0.0.1"
// id "com.mx.binks" version "0.0.1" // for local testing
id "com.github.mxenabled.coppuccino" version "4.4.2"
id "com.github.mxenabled.vogue" version "1.1.0"
id "groovy"
id "java"
id "maven-publish"
id "java-gradle-plugin"
id "org.jetbrains.kotlin.jvm" version "1.7.10"
id "org.jetbrains.kotlin.jvm" version "2.1.0"
}

group "com.mx.binks"
version "0.0.1"
sourceCompatibility = 1.8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

repositories {
mavenCentral()
Expand All @@ -26,15 +26,9 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API

constraints {
implementation ("com.thoughtworks.xstream:xstream:1.4.19") { because "It resolves a bajillion CVEs" }
}

// Unit tests
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.+"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.+"
testImplementation "org.mockito:mockito-inline:4.+"
testImplementation "org.spockframework:spock-core:2.2-M1-groovy-3.0"
testImplementation "org.mockito:mockito-inline:[4.0,5.0)"
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
}

gradlePlugin {
Expand All @@ -50,19 +44,29 @@ gradlePlugin {
}
}

compileKotlin { kotlinOptions { jvmTarget = "1.8" } }

compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } }
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_11
}
}

coppuccino { kotlin { enabled = true } }
coppuccino {
kotlin {
enabled = true
}
}

sourceSets {
test { groovy { srcDirs "src/test/groovy" } }
test {
groovy {
srcDirs "src/test/groovy"
}
}
}

test { useJUnitPlatform() }

wrapper {
gradleVersion = "7.4.1"
gradleVersion = "7.6.3"
distributionType = Wrapper.DistributionType.ALL
}
197 changes: 116 additions & 81 deletions gradle.lockfile

Large diffs are not rendered by default.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ pluginManagement {
}
}

rootProject.name = 'binks'
rootProject.name = 'binks'
5 changes: 2 additions & 3 deletions src/main/kotlin/com/mx/binks/ReleaseTask.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ open class ReleaseTask : DefaultTask() {
option = "force",
description = "Force tag. Moves existing tag to current hash"
)

@get:Input
var force: Boolean = false

Expand Down Expand Up @@ -72,9 +71,9 @@ open class ReleaseTask : DefaultTask() {
}
throw ReleaseError(
"${
red("You'sa in big doodoo, dis time!")
red("You'sa in big doodoo, dis time!")
}\n${
yellow("Version ($version) already in use. Change the version or use --force")
yellow("Version ($version) already in use. Change the version or use --force")
}"
)
}
Expand Down
Loading