Skip to content

Commit

Permalink
~ upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
vantoozz committed Nov 11, 2023
1 parent 8365117 commit 94aee60
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 38 deletions.
6 changes: 6 additions & 0 deletions .idea/dikt.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/modules/lib/dikt.lib.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions .idea/modules/lib/dikt.lib.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/modules/lib/dikt.lib.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 5 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -116,6 +113,7 @@ esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Expand Down Expand Up @@ -196,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ goto fail

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

Expand Down
76 changes: 46 additions & 30 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import fr.brouillard.oss.jgitver.Strategies
import kotlinx.kover.gradle.plugin.dsl.MetricType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
`java-library`
`maven-publish`
id("com.github.ben-manes.versions") version "0.46.0"
id("io.gitlab.arturbosch.detekt") version "1.22.0"
id("org.jetbrains.kotlinx.kover") version "0.6.1"
kotlin("jvm") version "1.8.21"
id("com.github.ben-manes.versions") version "0.49.0"
id("fr.brouillard.oss.gradle.jgitver") version "0.9.1"
id("io.gitlab.arturbosch.detekt") version "1.23.3"
id("org.jetbrains.kotlinx.kover") version "0.7.4"
kotlin("jvm") version "1.9.20"
signing
}

Expand All @@ -23,28 +28,23 @@ dependencies {
testImplementation(kotlin("test"))
}

publishing {
repositories {
maven {
name = "Sonatype"
url = if (version.toString().endsWith("SNAPSHOT")) {
uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
} else {
uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
}
jgitver {
strategy = Strategies.MAVEN
useDirty = true
}

credentials {
username = project.properties["ossrhUsername"] as String
password = project.properties["ossrhPassword"] as String
}
}
}
publishing {
publications {
create<MavenPublication>("dikt") {
from(components["java"])
groupId = "io.github.vantoozz"
artifactId = "dikt"
version = "0.13.0"

versionMapping {
usage("java-runtime") {
fromResolutionResult()
}
}

pom {
name.set("Dikt")
Expand All @@ -71,6 +71,26 @@ publishing {
}
}
}

repositories {
maven {
name = "Sonatype"
afterEvaluate {
url = if (project.version.toString().endsWith("-SNAPSHOT")
|| project.version.toString().endsWith("-dirty")
) {
uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
} else {
uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
}

credentials {
username = project.properties["ossrhUsername"] as String
password = project.properties["ossrhPassword"] as String
}
}
}
}
}

signing {
Expand All @@ -82,25 +102,21 @@ tasks {
useJUnitPlatform()
}

withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
}

kotlin {
jvmToolchain {
languageVersion
.set(JavaLanguageVersion.of(8))
}
jvmToolchain(8)
}

kover {
koverReport {
verify {
kotlinx.kover.api.CounterType.values().forEach {
rule {
name = "Minimal ${it.name} coverage rate in percents"
MetricType.values().forEach {
rule("Minimal ${it.name} coverage rate in percents") {
bound {
counter = it
metric = it
minValue = 100
}
}
Expand Down

0 comments on commit 94aee60

Please sign in to comment.