diff --git a/build.gradle.kts b/build.gradle.kts index 6b9bb6e74..074769cb5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,6 @@ +import com.dfsek.terra.configureCompilation +import com.dfsek.terra.configureDependencies +import com.dfsek.terra.configurePublishing import com.dfsek.terra.getGitHash val versionObj = Version("6", "0", "0", true) @@ -6,10 +9,15 @@ allprojects { version = versionObj group = "com.dfsek.terra" + configureDependencies() + configureCompilation() + configurePublishing() + tasks.withType().configureEach { options.isFork = true options.isIncremental = true } + tasks.withType().configureEach { useJUnitPlatform() @@ -21,7 +29,6 @@ allprojects { reports.html.isEnabled = false reports.junitXml.isEnabled = false } - } /** * Version class that does version stuff. diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt index dd5cb26f1..d937a27a2 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt @@ -4,20 +4,13 @@ import org.gradle.api.Project import java.io.ByteArrayOutputStream fun Project.configureCommon() { - configureDependencies() - configureCompilation() configureDistribution() - configurePublishing() version = rootProject.version } fun Project.configureAddon() { - configureDependencies() - configureCompilation() - configurePublishing() - version = rootProject.version } fun Project.getGitHash(): String { diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts index 76df5bf41..0058624fb 100644 --- a/common/api/build.gradle.kts +++ b/common/api/build.gradle.kts @@ -1,13 +1,3 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies -import com.dfsek.terra.configurePublishing - -configureCompilation() -configureDependencies() -configurePublishing() - - - dependencies { "shadedApi"("com.dfsek:Paralithic:0.4.0") diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts index 8dc740f02..133b7d1c6 100644 --- a/common/implementation/build.gradle.kts +++ b/common/implementation/build.gradle.kts @@ -1,11 +1,3 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies - -configureCompilation() -configureDependencies() - - - dependencies { "shadedApi"(project(":common:api")) "shadedApi"(project(":common:loader:config")) diff --git a/common/loader/addon/build.gradle.kts b/common/loader/addon/build.gradle.kts index 85e86627b..e4239d784 100644 --- a/common/loader/addon/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -1,11 +1,3 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies - -configureCompilation() -configureDependencies() - - - dependencies { "shadedApi"(project(":common:api")) } diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts index 85e86627b..e4239d784 100644 --- a/common/loader/config/build.gradle.kts +++ b/common/loader/config/build.gradle.kts @@ -1,11 +1,3 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies - -configureCompilation() -configureDependencies() - - - dependencies { "shadedApi"(project(":common:api")) }