From 5a0f60f8866aecf378b0426d9984dc56220c3802 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 3 Feb 2024 16:31:18 +0700 Subject: [PATCH] Don't specify different versions for modules --- build.gradle.kts | 5 +++++ collect/build.gradle.kts | 5 ----- core/build.gradle.kts | 5 ----- gradle.properties | 10 +--------- guava/build.gradle.kts | 5 ----- io-math/build.gradle.kts | 5 ----- io/build.gradle.kts | 5 ----- linear-algebra/build.gradle.kts | 3 --- math/build.gradle.kts | 5 ----- networking/build.gradle.kts | 6 ------ 10 files changed, 6 insertions(+), 48 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a19952b..c380ff6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,12 +27,17 @@ tasks.jar { } val projectGroup: String by project +val projectVersion: String by project + +version = projectVersion +group = projectGroup subprojects { apply(plugin = "maven-publish") apply(plugin = "kotlin") group = projectGroup + version = projectVersion tasks.compileKotlin { kotlinOptions { diff --git a/collect/build.gradle.kts b/collect/build.gradle.kts index 7e45d5f..71e469e 100644 --- a/collect/build.gradle.kts +++ b/collect/build.gradle.kts @@ -3,13 +3,8 @@ plugins { `maven-publish` } -val collectVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = collectVersion - repositories { mavenCentral() } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 5927620..fb55b21 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -4,13 +4,8 @@ plugins { `maven-publish` } -val coreVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = coreVersion - repositories { mavenCentral() } diff --git a/gradle.properties b/gradle.properties index 74975b6..be190a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,6 @@ kotlin.code.style=official specifyKotlinAsDependency=false projectGroup=ru.dbotthepony.kommons +projectVersion=1.0.2 guavaDepVersion=33.0.0 - -kommonsVersion=1.0.1 -coreVersion=1.0.1 -ioVersion=1.0.1 -networkingVersion=1.0.1 -mathVersion=1.0.1 -collectVersion=1.0.1 -guavaVersion=1.0.1 -linearAlgebraVersion=1.0.1 diff --git a/guava/build.gradle.kts b/guava/build.gradle.kts index 9602b58..80abbb3 100644 --- a/guava/build.gradle.kts +++ b/guava/build.gradle.kts @@ -3,14 +3,9 @@ plugins { `maven-publish` } -val guavaVersion: String by project val guavaDepVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = guavaVersion - repositories { mavenCentral() } diff --git a/io-math/build.gradle.kts b/io-math/build.gradle.kts index 209337d..4fc1d3e 100644 --- a/io-math/build.gradle.kts +++ b/io-math/build.gradle.kts @@ -3,13 +3,8 @@ plugins { `maven-publish` } -val kommonsVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = kommonsVersion - repositories { mavenCentral() } diff --git a/io/build.gradle.kts b/io/build.gradle.kts index 5825871..9e0b2c2 100644 --- a/io/build.gradle.kts +++ b/io/build.gradle.kts @@ -3,13 +3,8 @@ plugins { `maven-publish` } -val ioVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = ioVersion - repositories { mavenCentral() } diff --git a/linear-algebra/build.gradle.kts b/linear-algebra/build.gradle.kts index 790067b..aa9d26e 100644 --- a/linear-algebra/build.gradle.kts +++ b/linear-algebra/build.gradle.kts @@ -3,11 +3,8 @@ plugins { kotlin("jvm") } -val linearAlgebraVersion: String by project val specifyKotlinAsDependency: String by project -version = linearAlgebraVersion - repositories { mavenCentral() } diff --git a/math/build.gradle.kts b/math/build.gradle.kts index 5ff5ad1..4f8f9b5 100644 --- a/math/build.gradle.kts +++ b/math/build.gradle.kts @@ -3,13 +3,8 @@ plugins { `maven-publish` } -val mathVersion: String by project -val projectGroup: String by project val specifyKotlinAsDependency: String by project -group = projectGroup -version = mathVersion - repositories { mavenCentral() } diff --git a/networking/build.gradle.kts b/networking/build.gradle.kts index 5b03e44..e8c9208 100644 --- a/networking/build.gradle.kts +++ b/networking/build.gradle.kts @@ -4,12 +4,6 @@ plugins { `maven-publish` } -val networkingVersion: String by project -val projectGroup: String by project - -group = projectGroup -version = networkingVersion - repositories { mavenCentral() }