Fix project assembly

Mr3zee · Mr3zee · commit 71d8bb933264 · 2025-01-13T17:38:49.000+01:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,9 @@
 #
-# Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
 #
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/krpc/krpc-client/build.gradle.kts b/krpc/krpc-client/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import util.applyAtomicfuPlugin
@@ -18,6 +18,11 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
+                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+                implementation(projects.core)
+                implementation(projects.utils)
+                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
+
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
 
diff --git a/krpc/krpc-core/build.gradle.kts b/krpc/krpc-core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import util.applyAtomicfuPlugin
@@ -20,6 +20,9 @@ kotlin {
                 api(projects.krpc.krpcSerialization.krpcSerializationCore)
                 implementation(projects.krpc.krpcLogging)
 
+                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+                implementation(projects.utils)
+
                 api(libs.coroutines.core)
                 implementation(libs.serialization.core)
                 implementation(libs.kotlin.reflect)
diff --git a/krpc/krpc-ktor/krpc-ktor-client/build.gradle.kts b/krpc/krpc-ktor/krpc-ktor-client/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 plugins {
@@ -14,6 +14,10 @@ kotlin {
                 api(projects.krpc.krpcClient)
                 api(projects.krpc.krpcKtor.krpcKtorCore)
 
+                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+                implementation(projects.krpc.krpcCore)
+                implementation(projects.core)
+
                 api(libs.ktor.client.core)
                 api(libs.ktor.client.websockets)
 
diff --git a/krpc/krpc-ktor/krpc-ktor-core/build.gradle.kts b/krpc/krpc-ktor/krpc-ktor-core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 plugins {
@@ -14,6 +14,10 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
+                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+                implementation(projects.core)
+                implementation(projects.utils)
+
                 implementation(libs.ktor.websockets)
                 implementation(libs.coroutines.core)
                 implementation(libs.serialization.core)
diff --git a/krpc/krpc-server/build.gradle.kts b/krpc/krpc-server/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import util.applyAtomicfuPlugin
@@ -18,6 +18,11 @@ kotlin {
             dependencies {
                 api(projects.krpc.krpcCore)
 
+                // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+                implementation(projects.core)
+                implementation(projects.utils)
+                implementation(projects.krpc.krpcSerialization.krpcSerializationCore)
+
                 implementation(projects.krpc.krpcLogging)
 
                 implementation(libs.serialization.core)
diff --git a/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/BoxTestGenerated.java b/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/BoxTestGenerated.java
@@ -1,7 +1,7 @@
 
 
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test.runners;
diff --git a/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/DiagnosticTestGenerated.java b/tests/compiler-plugin-tests/src/test-gen/kotlinx/rpc/codegen/test/runners/DiagnosticTestGenerated.java
@@ -1,7 +1,7 @@
 
 
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test.runners;
diff --git a/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/GenerateTests.kt b/tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/GenerateTests.kt
@@ -1,10 +1,9 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package kotlinx.rpc.codegen.test
 
-import kotlinx.rpc.codegen.test.runners.AbstractBoxTest
 import kotlinx.rpc.codegen.test.runners.AbstractDiagnosticTest
 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
 
@@ -15,9 +14,10 @@ fun main() {
                 model("diagnostics")
             }
 
-            testClass<AbstractBoxTest> {
-                model("box")
-            }
+            // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests
+//            testClass<AbstractBoxTest> {
+//                model("box")
+//            }
         }
     }
 }
diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml
@@ -126,4 +126,4 @@ conventions-npm = { id = "conventions-npm", version.ref = "kotlinx-rpc" }
 compiler-specific-module = { id = "compiler-specific-module", version.ref = "kotlinx-rpc" }
 
 # gradle-plugin project
-kotlinx-rpc = { id = "org.jetbrains.kotlinx.rpc.plugin", version.ref = "kotlinx-rpc" }
+kotlinx-rpc = { id = "org.jetbrains.kotlinx.rpc.plugin" }

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.`
	`2`	`+# Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`distributionBase=GRADLE_USER_HOME`
`6`	`6`	`distributionPath=wrapper/dists`
`7`		`-distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.10.2-bin.zip`
	`7`	`+distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.12-bin.zip`
`8`	`8`	`zipStoreBase=GRADLE_USER_HOME`
`9`	`9`	`zipStorePath=wrapper/dists`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.`
	`2`	`+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`package kotlinx.rpc.codegen.test`
`6`	`6`
`7`		`-import kotlinx.rpc.codegen.test.runners.AbstractBoxTest`
`8`	`7`	`import kotlinx.rpc.codegen.test.runners.AbstractDiagnosticTest`
`9`	`8`	`import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5`
`10`	`9`
`@@ -15,9 +14,10 @@ fun main() {`
`15`	`14`	`model("diagnostics")`
`16`	`15`	`}`
`17`	`16`
`18`		`- testClass<AbstractBoxTest> {`
`19`		`- model("box")`
`20`		`- }`
	`17`	`+ // KRPC-137 Remove temporary explicit dependencies in 2.1.10 and unmute compiler tests`
	`18`	`+// testClass<AbstractBoxTest> {`
	`19`	`+// model("box")`
	`20`	`+// }`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`