Skip to content

Commit f12895c

Browse files
aSemyaSemy
authored
Version bumps (#44)
* still mucking about, trying to get gradle publishing working properly * fix maven central badge * fix test - order alphabetically * bump kotlin 1.7 (plus support libs)
1 parent f184999 commit f12895c

File tree

7 files changed

+74
-62
lines changed

7 files changed

+74
-62
lines changed

‎buildSrc/repositories.settings.gradle.kts

+10
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ dependencyResolutionManagement {
2020
metadataSources { artifact() }
2121
content { includeModule("com.yarnpkg", "yarn") }
2222
}
23+
24+
sonatypeSnapshots()
2325
}
2426

2527
pluginManagement {
@@ -28,6 +30,7 @@ dependencyResolutionManagement {
2830
jitpack()
2931
gradlePluginPortal()
3032
mavenCentral()
33+
sonatypeSnapshots()
3134
}
3235
}
3336
}
@@ -38,6 +41,13 @@ fun RepositoryHandler.jitpack() {
3841
}
3942

4043

44+
fun RepositoryHandler.sonatypeSnapshots() {
45+
maven("https://oss.sonatype.org/content/repositories/snapshots") {
46+
mavenContent { snapshotsOnly() }
47+
}
48+
}
49+
50+
4151
fun RepositoryHandler.myMavenLocal(enabled: Boolean = false) {
4252
if (enabled) {
4353
logger.lifecycle("Maven local is enabled")

‎buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222

2323
kotlin {
2424
jvmToolchain {
25-
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
25+
languageVersion.set(JavaLanguageVersion.of(11))
2626
}
2727
}
2828

‎docs/code/test/PolymorphismTest.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,21 @@ class PolymorphismTest : FunSpec({
110110
|
111111
|export namespace Project {
112112
| export enum Type {
113-
| OProj = "OProj",
114113
| DeprecatedProject = "dev.adamko.kxstsgen.example.examplePolymorphicSealedClass01.DeprecatedProject",
115-
| }
116-
|
117-
| export interface OProj {
118-
| type: Project.Type.OProj;
119-
| name: string;
120-
| owner: string;
114+
| OProj = "OProj",
121115
| }
122116
|
123117
| export interface DeprecatedProject {
124118
| type: Project.Type.DeprecatedProject;
125119
| name: string;
126120
| reason: string;
127121
| }
122+
|
123+
| export interface OProj {
124+
| type: Project.Type.OProj;
125+
| name: string;
126+
| owner: string;
127+
| }
128128
|}
129129
""".trimMargin()
130130
.normalize()

‎docs/polymorphism.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,21 @@ export type Project =
169169

170170
export namespace Project {
171171
export enum Type {
172-
OProj = "OProj",
173172
DeprecatedProject = "dev.adamko.kxstsgen.example.examplePolymorphicSealedClass01.DeprecatedProject",
174-
}
175-
176-
export interface OProj {
177-
type: Project.Type.OProj;
178-
name: string;
179-
owner: string;
173+
OProj = "OProj",
180174
}
181175

182176
export interface DeprecatedProject {
183177
type: Project.Type.DeprecatedProject;
184178
name: string;
185179
reason: string;
186180
}
181+
182+
export interface OProj {
183+
type: Project.Type.OProj;
184+
name: string;
185+
owner: string;
186+
}
187187
}
188188
```
189189

‎gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ org.gradle.caching=true
33
org.gradle.unsafe.configuration-cache=true
44
org.gradle.unsafe.configuration-cache-problems=warn
55

6+
# https://github.com/gradle/gradle/issues/20416
67
org.gradle.kotlin.dsl.precompiled.accessors.strict=true

‎gradle/kotlin-js-store/yarn.lock

+33-33
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ chalk@^4.1.0:
8585
ansi-styles "^4.1.0"
8686
supports-color "^7.1.0"
8787

88-
[email protected].2:
89-
version "3.5.2"
90-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
91-
integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
88+
[email protected].3:
89+
version "3.5.3"
90+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
91+
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
9292
dependencies:
9393
anymatch "~3.1.2"
9494
braces "~3.0.2"
@@ -126,10 +126,10 @@ [email protected]:
126126
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
127127
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
128128

129-
[email protected].2:
130-
version "4.3.2"
131-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
132-
integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
129+
[email protected].3:
130+
version "4.3.3"
131+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
132+
integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
133133
dependencies:
134134
ms "2.1.2"
135135

@@ -205,10 +205,10 @@ glob-parent@~5.1.2:
205205
dependencies:
206206
is-glob "^4.0.1"
207207

208-
glob@7.1.7:
209-
version "7.1.7"
210-
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
211-
integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
208+
glob@7.2.0:
209+
version "7.2.0"
210+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
211+
integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
212212
dependencies:
213213
fs.realpath "^1.0.0"
214214
inflight "^1.0.4"
@@ -325,32 +325,32 @@ minimatch@^3.0.4:
325325
dependencies:
326326
brace-expansion "^1.1.7"
327327

328-
mocha@9.1.2:
329-
version "9.1.2"
330-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.2.tgz#93f53175b0f0dc4014bd2d612218fccfcf3534d3"
331-
integrity sha512-ta3LtJ+63RIBP03VBjMGtSqbe6cWXRejF9SyM9Zyli1CKZJZ+vfCTj3oW24V7wAphMJdpOFLoMI3hjJ1LWbs0w==
328+
mocha@9.2.1:
329+
version "9.2.1"
330+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.1.tgz#a1abb675aa9a8490798503af57e8782a78f1338e"
331+
integrity sha512-T7uscqjJVS46Pq1XDXyo9Uvey9gd3huT/DD9cYBb4K2Xc/vbKRPUWK067bxDQRK0yIz6Jxk73IrnimvASzBNAQ==
332332
dependencies:
333333
"@ungap/promise-all-settled" "1.1.2"
334334
ansi-colors "4.1.1"
335335
browser-stdout "1.3.1"
336-
chokidar "3.5.2"
337-
debug "4.3.2"
336+
chokidar "3.5.3"
337+
debug "4.3.3"
338338
diff "5.0.0"
339339
escape-string-regexp "4.0.0"
340340
find-up "5.0.0"
341-
glob "7.1.7"
341+
glob "7.2.0"
342342
growl "1.10.5"
343343
he "1.2.0"
344344
js-yaml "4.1.0"
345345
log-symbols "4.1.0"
346346
minimatch "3.0.4"
347347
ms "2.1.3"
348-
nanoid "3.1.25"
348+
nanoid "3.2.0"
349349
serialize-javascript "6.0.0"
350350
strip-json-comments "3.1.1"
351351
supports-color "8.1.1"
352352
which "2.0.2"
353-
workerpool "6.1.5"
353+
workerpool "6.2.0"
354354
yargs "16.2.0"
355355
yargs-parser "20.2.4"
356356
yargs-unparser "2.0.0"
@@ -365,10 +365,10 @@ [email protected]:
365365
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
366366
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
367367

368-
nanoid@3.1.25:
369-
version "3.1.25"
370-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
371-
integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
368+
nanoid@3.2.0:
369+
version "3.2.0"
370+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
371+
integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
372372

373373
normalize-path@^3.0.0, normalize-path@~3.0.0:
374374
version "3.0.0"
@@ -442,10 +442,10 @@ [email protected]:
442442
dependencies:
443443
randombytes "^2.1.0"
444444

445-
[email protected].20:
446-
version "0.5.20"
447-
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
448-
integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
445+
[email protected].21:
446+
version "0.5.21"
447+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
448+
integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
449449
dependencies:
450450
buffer-from "^1.0.0"
451451
source-map "^0.6.0"
@@ -504,10 +504,10 @@ [email protected]:
504504
dependencies:
505505
isexe "^2.0.0"
506506

507-
workerpool@6.1.5:
508-
version "6.1.5"
509-
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
510-
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
507+
workerpool@6.2.0:
508+
version "6.2.0"
509+
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
510+
integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
511511

512512
wrap-ansi@^7.0.0:
513513
version "7.0.0"

‎gradle/libs.versions.toml

+15-14
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,27 @@
33
jvmTarget = "1.8"
44
kotlinTarget = "1.6"
55

6-
kotlin = "1.6.21"
6+
kotlin = "1.7.0" # https://github.com/JetBrains/kotlin/releases
77

8-
kotlinSymbolProcessing = "1.6.21-1.0.5"
9-
kotlinCompileTesting = "1.4.8"
8+
kotlinSymbolProcessing = "1.7.0-1.0.6" # https://github.com/google/ksp/releases
9+
kotlinCompileTesting = "1.4.8" # https://github.com/tschuchortdev/kotlin-compile-testing/releases
1010

11-
kotlinx-serialization = "1.3.3"
12-
kotlinx-knit = "0.4.0"
13-
kotlinx-coroutines = "1.6.1"
14-
kotlinx-kover = "0.5.0"
11+
kotlinx-serialization = "1.3.3" # https://github.com/Kotlin/kotlinx.serialization/releases/tag/v1.3.3
12+
kotlinx-knit = "0.4.0" # https://github.com/Kotlin/kotlinx-knit/releases
13+
kotlinx-coroutines = "1.6.1" # https://github.com/Kotlin/kotlinx.coroutines/releases
14+
kotlinx-kover = "0.5.1" # https://github.com/Kotlin/kotlinx-kover/releases
1515

16-
okio = "3.1.0"
16+
okio = "3.1.0" # https://search.maven.org/artifact/com.squareup.okio/okio
1717

18-
kotest = "5.3.0"
18+
kotest = "5.3.0" # https://github.com/kotest/kotest/releases
19+
kotestSnapshot = "5.3.0.1010-SNAPSHOT"
1920

20-
kotlinProcess = "1.3.1"
21+
kotlinProcess = "1.3.1" # https://github.com/pgreze/kotlin-process/releases
2122

22-
classgraph = "4.8.143"
23+
classgraph = "4.8.147" # https://github.com/classgraph/classgraph/releases
2324

24-
gradleNodePlugin = "3.3.0"
25-
gitVersioningPlugin = "6.1.2"
25+
gradleNodePlugin = "3.3.0" # https://github.com/node-gradle/gradle-node-plugin/releases
26+
gitVersioningPlugin = "6.1.4" # https://github.com/qoomon/gradle-git-versioning-plugin/releases
2627

2728
[libraries]
2829

@@ -52,7 +53,7 @@ kotlinCompileTesting-ksp = { group = "com.github.tschuchortdev", name = "kotlin-
5253

5354
## Kotest ##
5455

55-
kotest-bom = { group = "io.kotest", name = "kotest-bom", version.ref = "kotest" }
56+
kotest-bom = { group = "io.kotest", name = "kotest-bom", version.ref = "kotestSnapshot" }
5657
kotest-assertionsCore = { group = "io.kotest", name = "kotest-assertions-core" }
5758
kotest-assertionsJson = { group = "io.kotest", name = "kotest-assertions-json" }
5859
kotest-property = { group = "io.kotest", name = "kotest-property" }

0 commit comments

Comments
 (0)