Skip to content

Commit 6f03e51

Browse files
authored
Merge pull request #21 from atholbro/adhoc/update-libs-20260403
Update libs, enable auto publishing.
2 parents cb1c12b + 8df1985 commit 6f03e51

9 files changed

Lines changed: 11 additions & 15 deletions

File tree

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ ij_java_wrap_long_lines = false
255255

256256
[*.{kt,kts}] # See danger section: https://pinterest.github.io/ktlint/1.1.0/rules/configuration-ktlint/
257257
ktlint_code_style = intellij_idea
258+
ktlint_standard_no-unused-imports = enabled
258259
ktlint_standard_multiline-expression-wrapping = disabled
259260
ktlint_standard_string-template-indent = disabled
260261
ij_continuation_indent_size = 4

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
21
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
32
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
43

@@ -68,6 +67,7 @@ allprojects {
6867

6968
withType<Test>().configureEach {
7069
useJUnitPlatform()
70+
jvmArgs = listOf("-Xshare:off")
7171

7272
testLogging {
7373
events("failed", "skipped")

gradle/libs.versions.toml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ gradleUpdateVersions = "1.1.0"
88
gradleVersions = "0.53.0"
99
# @keep used manually for jacoco config, see build.gradle.kts
1010
jacoco = "0.8.14"
11-
junit-jupiter = "6.0.3"
12-
junit-platform = "6.0.3"
11+
junit = "6.0.3"
1312
# @keep jvm target
1413
jvm = "17"
15-
kotest = "6.1.4"
16-
kotlin = "2.3.10"
14+
kotest = "6.1.10"
15+
kotlin = "2.3.20"
1716
kotlinter = "5.4.2"
1817
kotlinx-serialization = "1.10.0"
1918
mockk = "1.14.9"
@@ -22,10 +21,10 @@ nmcp = "1.4.4"
2221
[libraries]
2322
bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
2423
clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
25-
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
26-
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
27-
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
28-
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
24+
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
25+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
26+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
27+
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit" }
2928
kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
3029
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
3130
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Wed Dec 04 12:38:49 EST 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

paseto/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ nmcpAggregation {
144144
username = System.getenv("PUBLISH_USER")
145145
password = System.getenv("PUBLISH_PASS")
146146

147-
publishingType = "USER_MANAGED"
147+
publishingType = "AUTOMATIC"
148148
}
149149
}
150150

paseto/src/test/kotlin/net/aholbrook/paseto/protocol/TestVectors.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import io.kotest.matchers.shouldBe
55
import kotlinx.serialization.SerialName
66
import kotlinx.serialization.Serializable
77
import kotlinx.serialization.json.Json
8-
import net.aholbrook.paseto.InternalApi
98
import net.aholbrook.paseto.crypto.withTestNonce
109
import net.aholbrook.paseto.protocol.key.AsymmetricPublicKey
1110
import net.aholbrook.paseto.protocol.key.AsymmetricSecretKey

paseto/src/test/kotlin/net/aholbrook/paseto/protocol/key/SymmetricKeyTests.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import net.aholbrook.paseto.exception.KeyLengthException
1111
import net.aholbrook.paseto.exception.KeyPurposeException
1212
import net.aholbrook.paseto.exception.KeyVersionException
1313
import net.aholbrook.paseto.keyV4Local
14-
import net.aholbrook.paseto.keyV4Public
1514
import net.aholbrook.paseto.protocol.Purpose
1615
import net.aholbrook.paseto.protocol.Version
1716
import org.junit.jupiter.api.Test

paseto/src/test/kotlin/net/aholbrook/paseto/rules/NotExpiredTests.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import org.junit.jupiter.params.provider.ValueSource
1414
import java.time.Clock
1515
import java.time.Instant
1616
import java.time.ZoneId
17-
import kotlin.longArrayOf
1817

1918
class NotExpiredTests {
2019
@ParameterizedTest

paseto/src/testFixtures/kotlin/net/aholbrook/paseto/ServiceTestVectorFixtures.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import kotlinx.serialization.json.intOrNull
1414
import kotlinx.serialization.json.jsonPrimitive
1515
import kotlinx.serialization.json.longOrNull
1616
import java.time.Instant
17-
import kotlin.collections.forEach
1817

1918
@Serializable
2019
data class ServiceTestVectors(val name: String, val version: String, val tests: List<ServiceTestVector>)

0 commit comments

Comments
 (0)