Skip to content

Bump kotlin from 1.9.24 to 2.0.0 #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 15, 2024
Merged

Bump kotlin from 1.9.24 to 2.0.0 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e9f591
---
dependabot[bot] May 27, 2024
5d14b85
Use native sourceset to provide actual filesystem for all native plat…
OptimumCode May 31, 2024
3cf306f
Correct jvmToolchain setup
OptimumCode May 31, 2024
21e33d2
Update yarn lock and gitignore
OptimumCode May 31, 2024
02a0f33
Update API dump
OptimumCode Jun 14, 2024
12df0b0
Increment minor version because of kotlin update to new major release
OptimumCode Jun 15, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ build/
out/

.gradle/
.kotlin/

# downloaded data for unicode characters
unicode_dump/
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ repositories {
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
}

implementation("io.github.optimumcode:json-schema-validator:0.1.1-SNAPSHOT")
implementation("io.github.optimumcode:json-schema-validator:0.2.0-SNAPSHOT")
```

##### Groovy
Expand All @@ -98,7 +98,7 @@ repositories {
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots' }
}

implementation 'io.github.optimumcode:json-schema-validator:0.1.1-SNAPSHOT'
implementation 'io.github.optimumcode:json-schema-validator:0.2.0-SNAPSHOT'
```

### Example
Expand Down
30 changes: 15 additions & 15 deletions api/json-schema-validator.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,13 @@ public final class io/github/optimumcode/json/schema/ValidationOutput$Basic : io
public fun toString ()Ljava/lang/String;
}

public final class io/github/optimumcode/json/schema/ValidationOutput$Basic$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public synthetic class io/github/optimumcode/json/schema/ValidationOutput$Basic$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public static final field INSTANCE Lio/github/optimumcode/json/schema/ValidationOutput$Basic$$serializer;
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$Basic;
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$Basic;
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$Basic;)V
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$Basic;)V
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
}
Expand All @@ -274,13 +274,13 @@ public final class io/github/optimumcode/json/schema/ValidationOutput$Flag : io/
public fun toString ()Ljava/lang/String;
}

public final class io/github/optimumcode/json/schema/ValidationOutput$Flag$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public synthetic class io/github/optimumcode/json/schema/ValidationOutput$Flag$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public static final field INSTANCE Lio/github/optimumcode/json/schema/ValidationOutput$Flag$$serializer;
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$Flag;
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$Flag;
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$Flag;)V
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$Flag;)V
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
}
Expand Down Expand Up @@ -314,13 +314,13 @@ public final class io/github/optimumcode/json/schema/ValidationOutput$OutputUnit
public fun toString ()Ljava/lang/String;
}

public final class io/github/optimumcode/json/schema/ValidationOutput$OutputUnit$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public synthetic class io/github/optimumcode/json/schema/ValidationOutput$OutputUnit$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
public static final field INSTANCE Lio/github/optimumcode/json/schema/ValidationOutput$OutputUnit$$serializer;
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$OutputUnit;
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lio/github/optimumcode/json/schema/ValidationOutput$OutputUnit;
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$OutputUnit;)V
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lio/github/optimumcode/json/schema/ValidationOutput$OutputUnit;)V
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
}
Expand Down
5 changes: 2 additions & 3 deletions benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ allOpen {
}

kotlin {
jvm {
jvmToolchain(11)
}
jvmToolchain(11)
jvm()
macosX64()
macosArm64()
iosX64()
Expand Down
3 changes: 1 addition & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,8 @@ kotlin {
compilerOptions {
freeCompilerArgs.add("-opt-in=io.github.optimumcode.json.schema.ExperimentalApi")
}
jvmToolchain(11)
jvm {
jvmToolchain(11)
withJava()
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.java.installations.auto-download=false
org.gradle.daemon=false

version=0.1.1-SNAPSHOT
version=0.2.0-SNAPSHOT
group=io.github.optimumcode
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
kotlin = "1.9.24"
kotlin = "2.0.0"
kotest = "5.9.1"
detekt = "1.23.6"
ktlint = "1.1.0"
Expand Down
Loading
Loading