Skip to content

Commit bcc2877

Browse files
MatyrobbrtMatyrobbrt
committed
Update to 1.20
1 parent a4719c2 commit bcc2877

File tree

77 files changed

+160
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+160
-155
lines changed

‎.teamcity/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</repository>
2323
<repository>
2424
<id>teamcity-server</id>
25-
<url>https://teamcity.moddinginquisition.org/app/dsl-plugins-repository</url>
25+
<url>https://teamcity.groovymc.org/app/dsl-plugins-repository</url>
2626
<snapshots>
2727
<enabled>true</enabled>
2828
</snapshots>
@@ -77,13 +77,13 @@
7777
<dependencies>
7878
<dependency>
7979
<groupId>org.jetbrains.teamcity</groupId>
80-
<artifactId>configs-dsl-kotlin-latest</artifactId>
80+
<artifactId>configs-dsl-kotlin</artifactId>
8181
<version>${teamcity.dsl.version}</version>
8282
<scope>compile</scope>
8383
</dependency>
8484
<dependency>
8585
<groupId>org.jetbrains.teamcity</groupId>
86-
<artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
86+
<artifactId>configs-dsl-kotlin-plugins</artifactId>
8787
<version>1.0-SNAPSHOT</version>
8888
<type>pom</type>
8989
<scope>compile</scope>

‎.teamcity/settings.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import jetbrains.buildServer.configs.kotlin.*
2-
import jetbrains.buildServer.configs.kotlin.buildFeatures.*
3-
import jetbrains.buildServer.configs.kotlin.buildSteps.gradle
4-
import jetbrains.buildServer.configs.kotlin.triggers.vcs
1+
import jetbrains.buildServer.configs.kotlin.v2019_2.*
2+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.*
3+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
4+
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
55

66
/*
77
The settings script is an entry point for defining a TeamCity

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/chat/StyleBuilder.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/chat/StyleBuilder.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.chat
6+
package org.groovymc.cgl.api.chat
77

88
import groovy.transform.CompileStatic
99
import net.minecraft.ChatFormatting

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/JanksonOps.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/JanksonOps.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec
6+
package org.groovymc.cgl.api.codec
77

88
import blue.endless.jankson.*
99
import com.mojang.datafixers.util.Pair
1010
import com.mojang.serialization.DataResult
1111
import com.mojang.serialization.DynamicOps
1212
import com.mojang.serialization.MapLike
1313
import groovy.transform.CompileStatic
14-
import io.github.groovymc.cgl.api.codec.comments.CommentSpec
15-
import io.github.groovymc.cgl.api.codec.comments.CommentingOps
14+
import org.groovymc.cgl.api.codec.comments.CommentSpec
15+
import org.groovymc.cgl.api.codec.comments.CommentingOps
1616
import org.jetbrains.annotations.Nullable
1717

1818
import java.util.stream.Stream
@@ -201,7 +201,7 @@ class JanksonOps implements CommentingOps<JsonElement> {
201201
DataResult<Stream<Pair<JsonElement, JsonElement>>> getMapValues(JsonElement input) {
202202
if (input instanceof JsonObject)
203203
return DataResult.<Stream<Pair<JsonElement,JsonElement>>>success(input.entrySet().stream().<Pair<JsonElement,JsonElement>>map {entry -> Pair.of(new JsonPrimitive(entry.key), entry.value instanceof JsonNull ? null : entry.value) })
204-
return DataResult.error {->"Not a JSON object: $input"}
204+
return DataResult.<Stream<Pair<JsonElement, JsonElement>>>error {->"Not a JSON object: $input"}
205205
}
206206

207207
@Override

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/NightConfigOps.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/NightConfigOps.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec
6+
package org.groovymc.cgl.api.codec
77

88
import com.electronwill.nightconfig.core.CommentedConfig
99
import com.electronwill.nightconfig.core.Config
@@ -12,8 +12,8 @@ import com.mojang.datafixers.util.Pair
1212
import com.mojang.serialization.DataResult
1313
import com.mojang.serialization.DynamicOps
1414
import groovy.transform.CompileStatic
15-
import io.github.groovymc.cgl.api.codec.comments.CommentSpec
16-
import io.github.groovymc.cgl.api.codec.comments.CommentingOps
15+
import org.groovymc.cgl.api.codec.comments.CommentSpec
16+
import org.groovymc.cgl.api.codec.comments.CommentingOps
1717

1818
import java.util.stream.Stream
1919

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/ObjectOps.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/ObjectOps.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec
6+
package org.groovymc.cgl.api.codec
77

88

99
import com.mojang.datafixers.util.Pair

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/TomlConfigOps.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/TomlConfigOps.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec
6+
package org.groovymc.cgl.api.codec
77

88
import com.electronwill.nightconfig.core.Config
99
import com.electronwill.nightconfig.toml.TomlFormat

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/TupleMapCodec.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/TupleMapCodec.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec
6+
package org.groovymc.cgl.api.codec
77

88
import com.mojang.serialization.*
99
import groovy.transform.CompileStatic
10-
import io.github.groovymc.cgl.api.codec.comments.CommentSpec
11-
import io.github.groovymc.cgl.api.codec.comments.CommentingOps
12-
import io.github.groovymc.cgl.api.codec.comments.MapCommentSpec
10+
import org.groovymc.cgl.api.codec.comments.CommentSpec
11+
import org.groovymc.cgl.api.codec.comments.CommentingOps
12+
import org.groovymc.cgl.api.codec.comments.MapCommentSpec
1313

1414
import java.util.concurrent.atomic.AtomicReference
1515
import java.util.function.UnaryOperator

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/comments/Comment.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/comments/Comment.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec.comments
6+
package org.groovymc.cgl.api.codec.comments
77

88
import groovy.transform.CompileStatic
99

@@ -13,7 +13,7 @@ import java.lang.annotation.RetentionPolicy
1313
import java.lang.annotation.Target
1414

1515
/**
16-
* Mark a property of a {@link io.github.lukebemish.groovyduvet.wrapper.minecraft.api.codec.CodecSerializable} class as
16+
* Mark a property of a {@link org.groovymc.cgl.api.transform.codec.CodecSerializable} class as
1717
* having a comment attached, and provide the comment. Should be placed on the field or getter method for the property.
1818
*/
1919
@Retention(RetentionPolicy.RUNTIME)

‎Common/src/extension/groovy/io/github/groovymc/cgl/api/codec/comments/CommentFirstListCodec.groovy‎ renamed to ‎Common/src/extension/groovy/org/groovymc/cgl/api/codec/comments/CommentFirstListCodec.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: LGPL-3.0-or-later
44
*/
55

6-
package io.github.groovymc.cgl.api.codec.comments
6+
package org.groovymc.cgl.api.codec.comments
77

88
import com.mojang.datafixers.util.Pair
99
import com.mojang.serialization.Codec

0 commit comments

Comments
 (0)