Merge pull request #501 from fwcd/move-platform

Move platform to subproject
fwcd · Oct 3, 2023 · 4150e44 · 4150e44
2 parents ba66720 + 4c8901f
commit 4150e44
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/gradle/platform/build.gradle.kts → platform/build.gradle.kts b/gradle/platform/build.gradle.kts → platform/build.gradle.kts
@@ -2,8 +2,6 @@ plugins {
     id("java-platform")
 }
 
-group = "dev.fwcd.kotlin-language-server"
-
 javaPlatform {
     allowDependencies()
 }

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -34,9 +34,9 @@ repositories {
 
 dependencies {
     // dependencies are constrained to versions defined
-    // in /gradle/platform/build.gradle.kts
-    implementation(platform("dev.fwcd.kotlin-language-server:platform"))
-    annotationProcessor(platform("dev.fwcd.kotlin-language-server:platform"))
+    // in /platform/build.gradle.kts
+    implementation(platform(project(":platform")))
+    annotationProcessor(platform(project(":platform")))
 
     implementation(project(":shared"))
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,13 +26,10 @@ pluginManagement {
     }
 }
 
-dependencyResolutionManagement {
-    includeBuild("gradle/platform")
-}
-
 rootProject.name = "kotlin-language-server"
 
 include(
+    "platform",
     "shared",
     "server",
     "grammars"

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -11,8 +11,8 @@ repositories {
 
 dependencies {
     // dependencies are constrained to versions defined
-    // in /gradle/platform/build.gradle.kts
-    implementation(platform("dev.fwcd.kotlin-language-server:platform"))
+    // in /platform/build.gradle.kts
+    implementation(platform(project(":platform")))
 
     implementation(kotlin("stdlib"))
     implementation("org.jetbrains.exposed:exposed-core")