Set modules version in one place for all modules

Kotlin · Dec 12, 2024 · 5273828 · 5273828
1 parent 9fa1617
commit 5273828
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,6 +9,9 @@ plugins {
 }
 
 subprojects {
+  version = findProperty("storytale.deploy.version")
+    ?: error("'storytale.deploy.version' was not set")
+
   plugins.withId("maven-publish") {
     configureIfExists<PublishingExtension> {
       repositories {

diff --git a/modules/compiler-plugin/build.gradle.kts b/modules/compiler-plugin/build.gradle.kts
@@ -18,7 +18,6 @@ sourceSets {
 }
 
 group = "org.jetbrains.compose.storytale"
-version = libs.versions.storytale.get()
 
 val emptyJavadocJar by tasks.registering(Jar::class) {
   archiveClassifier.set("javadoc")

diff --git a/modules/gallery/build.gradle.kts b/modules/gallery/build.gradle.kts
@@ -92,7 +92,6 @@ kotlin {
 }
 
 group = "org.jetbrains.compose.storytale"
-version = libs.versions.storytale.get()
 
 publishing {}
 

diff --git a/modules/gradle-plugin/build.gradle.kts b/modules/gradle-plugin/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
 }
 
 group = "org.jetbrains.compose.storytale"
-version = libs.versions.storytale.get()
 
 val emptyJavadocJar by tasks.registering(Jar::class) {
   archiveClassifier.set("javadoc")

diff --git a/modules/runtime-api/build.gradle.kts b/modules/runtime-api/build.gradle.kts
@@ -33,7 +33,6 @@ kotlin {
 }
 
 group = "org.jetbrains.compose.storytale"
-version = libs.versions.storytale.get()
 
 publishing {}
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,9 +1,6 @@
 rootProject.name = "Storytale"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-val storytaleVersion =
-  providers.gradleProperty("storytale.deploy.version").orNull?.takeIf(String::isNotBlank)
-
 pluginManagement {
   repositories {
     google {
@@ -31,12 +28,6 @@ dependencyResolutionManagement {
     mavenCentral()
     mavenLocal()
   }
-
-  if (storytaleVersion != null) {
-    versionCatalogs.register("libs") {
-      version("storytale", storytaleVersion)
-    }
-  }
 }
 
 include(":modules:gallery")
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,6 @@ kotlin { @@
     }
     group = "org.jetbrains.compose.storytale"
-    version = libs.versions.storytale.get()
     publishing {}
@@ Expand Down @@