cleanup

buildSrc/src/main/kotlin/KotlinJsUtils.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Toast, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.gradle.api.Project
+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.tasks.Copy
+import org.gradle.kotlin.dsl.named
+
+fun Project.cleanUpJsProcessResourcesTask() {
+    tasks.named<Copy>("jsProcessResources") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+}

buildSrc/src/main/kotlin/protokt.multiplatform-published-conventions.gradle.kts

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2024 Toast, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("protokt.multiplatform-conventions")
+}
+
+enablePublishing()
+trackKotlinApiCompatibility()

buildSrc/src/main/kotlin/protokt.multiplatform-published-proto-conventions.gradle.kts

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 Toast, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("protokt.multiplatform-published-conventions")
+}
+
+cleanUpJsProcessResourcesTask()

examples/protos/build.gradle.kts

@@ -21,6 +21,7 @@ plugins {
 }
 
 localProtokt()
+cleanUpJsProcessResourcesTask()
 
 protokt {
     generate {

extensions/protokt-extensions-api/build.gradle.kts

@@ -14,9 +14,7 @@
  */
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-conventions")
 }
 
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()

extensions/protokt-extensions-lite/build.gradle.kts

@@ -18,12 +18,10 @@ import protokt.v1.gradle.protokt
 import protokt.v1.gradle.protoktExtensions
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt()
-enablePublishing()
-trackKotlinApiCompatibility()
 
 spotless {
     kotlin {

extensions/protokt-extensions-simple/build.gradle.kts

@@ -14,12 +14,9 @@
  */
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-conventions")
 }
 
-enablePublishing()
-trackKotlinApiCompatibility()
-
 kotlin {
     sourceSets {
         val jvmMain by getting {

extensions/protokt-extensions/build.gradle.kts

@@ -17,13 +17,11 @@ import com.google.protobuf.gradle.proto
 import protokt.v1.gradle.protokt
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt()
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 spotless {
     kotlin {

protokt-core-lite/build.gradle.kts

@@ -17,14 +17,12 @@ import com.google.protobuf.gradle.protobuf
 import protokt.v1.gradle.protokt
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
     kotlin("kapt")
 }
 
 localProtokt()
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 spotless {
     kotlin {

protokt-core/build.gradle.kts

@@ -17,13 +17,11 @@ import com.google.protobuf.gradle.protobuf
 import protokt.v1.gradle.protokt
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt()
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 spotless {
     kotlin {

protokt-reflect/build.gradle.kts

@@ -17,12 +17,10 @@ import com.google.protobuf.gradle.proto
 import protokt.v1.gradle.testProtoktExtensions
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt(false)
-enablePublishing()
-trackKotlinApiCompatibility()
 
 kotlin {
     sourceSets {

protokt-runtime-grpc-lite/build.gradle.kts

@@ -14,12 +14,10 @@
  */
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-conventions")
 }
 
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 kotlin {
     sourceSets {

protokt-runtime-grpc/build.gradle.kts

@@ -14,12 +14,10 @@
  */
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-conventions")
 }
 
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 kotlin {
     sourceSets {

protokt-runtime/build.gradle.kts

@@ -14,12 +14,10 @@
  */
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-conventions")
 }
 
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 kotlin {
     sourceSets {

testing/conformance/driver/build.gradle.kts

@@ -35,6 +35,7 @@ plugins {
 }
 
 localProtokt()
+cleanUpJsProcessResourcesTask()
 
 kotlin {
     sourceSets {

testing/multiplatform-testing/build.gradle.kts

@@ -20,6 +20,7 @@ plugins {
 }
 
 localProtokt()
+cleanUpJsProcessResourcesTask()
 
 kotlin {
     sourceSets {

third-party/proto-google-common-protos-lite/build.gradle.kts

@@ -16,13 +16,11 @@
 import protokt.v1.gradle.protokt
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt()
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 protokt {
     generate {
@@ -52,11 +50,3 @@ sourceSets {
         }
     }
 }
-
-sourceSets {
-    test {
-        java {
-            srcDir(rootProject.file("shared-src/lite-util"))
-        }
-    }
-}

third-party/proto-google-common-protos/build.gradle.kts

@@ -16,13 +16,11 @@
 import protokt.v1.gradle.protokt
 
 plugins {
-    id("protokt.multiplatform-conventions")
+    id("protokt.multiplatform-published-proto-conventions")
 }
 
 localProtokt()
-enablePublishing()
 compatibleWithAndroid()
-trackKotlinApiCompatibility()
 
 protokt {
     generate {