diff --git a/build.gradle.kts b/build.gradle.kts index 2d045f712..b159900df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,3 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies -import com.dfsek.terra.configureDistribution -import com.dfsek.terra.configurePublishing -import com.dfsek.terra.forSubProjects -import com.dfsek.terra.preRelease -import com.dfsek.terra.version -import com.dfsek.terra.versionProjects - preRelease(true) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/AddonConfig.kt b/buildSrc/src/main/kotlin/AddonConfig.kt similarity index 98% rename from buildSrc/src/main/kotlin/com/dfsek/terra/AddonConfig.kt rename to buildSrc/src/main/kotlin/AddonConfig.kt index 88a197d22..b2ff00194 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/AddonConfig.kt +++ b/buildSrc/src/main/kotlin/AddonConfig.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import java.io.File import java.util.function.Predicate import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt b/buildSrc/src/main/kotlin/CompilationConfig.kt similarity index 98% rename from buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt rename to buildSrc/src/main/kotlin/CompilationConfig.kt index d954d9bb1..a8116b0a8 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt +++ b/buildSrc/src/main/kotlin/CompilationConfig.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import org.apache.tools.ant.filters.ReplaceTokens import org.gradle.api.JavaVersion import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/DependencyConfig.kt similarity index 98% rename from buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt rename to buildSrc/src/main/kotlin/DependencyConfig.kt index ff1f902c5..8e66a6686 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/DependencyConfig.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import org.gradle.api.Project import org.gradle.kotlin.dsl.creating import org.gradle.kotlin.dsl.dependencies diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt similarity index 99% rename from buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt rename to buildSrc/src/main/kotlin/DistributionConfig.kt index ecc9b7774..3ba0af041 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.io.File import java.io.FileInputStream diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/PublishingConfig.kt b/buildSrc/src/main/kotlin/PublishingConfig.kt similarity index 97% rename from buildSrc/src/main/kotlin/com/dfsek/terra/PublishingConfig.kt rename to buildSrc/src/main/kotlin/PublishingConfig.kt index 3331c1936..820010a78 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/PublishingConfig.kt +++ b/buildSrc/src/main/kotlin/PublishingConfig.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import org.gradle.api.Project import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt similarity index 98% rename from buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt rename to buildSrc/src/main/kotlin/Utils.kt index eb821eeb9..35b68e86e 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt +++ b/buildSrc/src/main/kotlin/Utils.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - import java.io.ByteArrayOutputStream import org.gradle.api.Action import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt similarity index 95% rename from buildSrc/src/main/kotlin/com/dfsek/terra/Versions.kt rename to buildSrc/src/main/kotlin/Versions.kt index 363ac122f..225ac7e4d 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,3 @@ -package com.dfsek.terra - object Versions { object Libraries { const val tectonic = "3.1.0" diff --git a/common/addons/api-addon-loader/build.gradle.kts b/common/addons/api-addon-loader/build.gradle.kts index 3069b6fa3..6f47aeb33 100644 --- a/common/addons/api-addon-loader/build.gradle.kts +++ b/common/addons/api-addon-loader/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/biome-provider-image/build.gradle.kts b/common/addons/biome-provider-image/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/biome-provider-image/build.gradle.kts +++ b/common/addons/biome-provider-image/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/biome-provider-pipeline/build.gradle.kts b/common/addons/biome-provider-pipeline/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/biome-provider-pipeline/build.gradle.kts +++ b/common/addons/biome-provider-pipeline/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/biome-provider-single/build.gradle.kts b/common/addons/biome-provider-single/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/biome-provider-single/build.gradle.kts +++ b/common/addons/biome-provider-single/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/chunk-generator-noise-3d/build.gradle.kts b/common/addons/chunk-generator-noise-3d/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/chunk-generator-noise-3d/build.gradle.kts +++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-biome/build.gradle.kts b/common/addons/config-biome/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-biome/build.gradle.kts +++ b/common/addons/config-biome/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-distributors/build.gradle.kts b/common/addons/config-distributors/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-distributors/build.gradle.kts +++ b/common/addons/config-distributors/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-feature/build.gradle.kts b/common/addons/config-feature/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-feature/build.gradle.kts +++ b/common/addons/config-feature/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-flora/build.gradle.kts b/common/addons/config-flora/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-flora/build.gradle.kts +++ b/common/addons/config-flora/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-locators/build.gradle.kts b/common/addons/config-locators/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-locators/build.gradle.kts +++ b/common/addons/config-locators/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-noise-function/build.gradle.kts b/common/addons/config-noise-function/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-noise-function/build.gradle.kts +++ b/common/addons/config-noise-function/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-ore/build.gradle.kts b/common/addons/config-ore/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-ore/build.gradle.kts +++ b/common/addons/config-ore/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-palette/build.gradle.kts b/common/addons/config-palette/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/config-palette/build.gradle.kts +++ b/common/addons/config-palette/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/config-structure/build.gradle.kts b/common/addons/config-structure/build.gradle.kts index c029ed3d9..41926910c 100644 --- a/common/addons/config-structure/build.gradle.kts +++ b/common/addons/config-structure/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/generation-stage-feature/build.gradle.kts b/common/addons/generation-stage-feature/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/generation-stage-feature/build.gradle.kts +++ b/common/addons/generation-stage-feature/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/generation-stage-structure/build.gradle.kts b/common/addons/generation-stage-structure/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/generation-stage-structure/build.gradle.kts +++ b/common/addons/generation-stage-structure/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/language-yaml/build.gradle.kts b/common/addons/language-yaml/build.gradle.kts index b1336f135..c523923c0 100644 --- a/common/addons/language-yaml/build.gradle.kts +++ b/common/addons/language-yaml/build.gradle.kts @@ -1,6 +1,3 @@ -import com.dfsek.terra.Versions -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/manifest-addon-loader/build.gradle.kts b/common/addons/manifest-addon-loader/build.gradle.kts index c545fab4b..889df3972 100644 --- a/common/addons/manifest-addon-loader/build.gradle.kts +++ b/common/addons/manifest-addon-loader/build.gradle.kts @@ -1,6 +1,3 @@ -import com.dfsek.terra.Versions -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/palette-block-shortcut/build.gradle.kts b/common/addons/palette-block-shortcut/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/palette-block-shortcut/build.gradle.kts +++ b/common/addons/palette-block-shortcut/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/structure-block-shortcut/build.gradle.kts b/common/addons/structure-block-shortcut/build.gradle.kts index f8ca974c1..5aa7c37fb 100644 --- a/common/addons/structure-block-shortcut/build.gradle.kts +++ b/common/addons/structure-block-shortcut/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/addons/structure-sponge-loader/build.gradle.kts b/common/addons/structure-sponge-loader/build.gradle.kts index b1a1d7526..b7f5e1309 100644 --- a/common/addons/structure-sponge-loader/build.gradle.kts +++ b/common/addons/structure-sponge-loader/build.gradle.kts @@ -1,4 +1,3 @@ -import com.dfsek.terra.version import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar version = version("0.1.0") diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index 956562116..ad68a5a74 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -1,4 +1,3 @@ -import com.dfsek.terra.version import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar version = version("0.1.0") diff --git a/common/addons/terrascript-function-check-noise-3d/build.gradle.kts b/common/addons/terrascript-function-check-noise-3d/build.gradle.kts index 4cf741b5f..7fd078195 100644 --- a/common/addons/terrascript-function-check-noise-3d/build.gradle.kts +++ b/common/addons/terrascript-function-check-noise-3d/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.version - version = version("0.1.0") dependencies { diff --git a/common/api/core/build.gradle.kts b/common/api/core/build.gradle.kts index 4cd1feee3..fd78cef39 100644 --- a/common/api/core/build.gradle.kts +++ b/common/api/core/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.Versions - dependencies { shadedApi(project(":common:api:util")) shadedApi(project(":common:api:noise")) diff --git a/common/api/util/build.gradle.kts b/common/api/util/build.gradle.kts index 98627cfd4..b6159649f 100644 --- a/common/api/util/build.gradle.kts +++ b/common/api/util/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.Versions - dependencies { shadedApi("com.dfsek.tectonic:common:${Versions.Libraries.tectonic}") diff --git a/common/implementation/base/build.gradle.kts b/common/implementation/base/build.gradle.kts index c20efd26f..8b78e4d86 100644 --- a/common/implementation/base/build.gradle.kts +++ b/common/implementation/base/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.Versions - dependencies { shadedApi(project(":common:api")) shadedApi(project(":common:implementation:bootstrap-addon-loader")) diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 06776ac9d..7db9cf4ad 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -1,6 +1,3 @@ -import com.dfsek.terra.addonDir -import com.dfsek.terra.Versions -import com.dfsek.terra.gitClone import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.net.URL import java.nio.channels.Channels diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 3b217e2f7..87afc80a5 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -1,5 +1,3 @@ -import com.dfsek.terra.addonDir -import com.dfsek.terra.Versions import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.modrinth.minotaur.TaskModrinthUpload import net.fabricmc.loom.task.RemapJarTask