Merge pull request #372 from modelix/build/repository-content-filtering

mhuster23 · web-flow · commit 9008ccbc5a09 · 2023-12-18T14:06:51.000+01:00
MODELIX-533 Use repository content filtering
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -168,10 +168,24 @@ subprojects {
 
 allprojects {
     repositories {
-        mavenLocal()
-        maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") }
-        mavenCentral()
+        val modelixRegex = "org\\.modelix.*"
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+                includeGroup("com.jetbrains") // for our mps dependencies
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
     }
 
     publishing {
diff --git a/bulk-model-sync-gradle-test/build.gradle.kts b/bulk-model-sync-gradle-test/build.gradle.kts
@@ -24,11 +24,29 @@ val modelixCoreVersion: String = file("../version.txt").readText()
 version = modelixCoreVersion
 
 repositories {
-    mavenLocal()
-    maven { url = uri("https://repo.maven.apache.org/maven2") }
-    maven { url = uri("https://plugins.gradle.org/m2/") }
-    mavenCentral()
-    maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
+    val modelixRegex = "org\\.modelix.*"
+    mavenLocal {
+        content {
+            includeGroupByRegex(modelixRegex)
+        }
+    }
+    gradlePluginPortal {
+        content {
+            excludeGroupByRegex(modelixRegex)
+        }
+    }
+    maven {
+        url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+        content {
+            includeGroupByRegex(modelixRegex)
+            includeGroup("com.jetbrains")
+        }
+    }
+    mavenCentral {
+        content {
+            excludeGroupByRegex(modelixRegex)
+        }
+    }
 }
 
 val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
@@ -84,15 +102,15 @@ modelSync {
             repositoryDir = repoDir
         }
         toModelServer {
-            url = "http://0.0.0.0:28309/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }
     }
     direction("testPull") {
         includeModule("GraphSolution")
         fromModelServer {
-            url = "http://0.0.0.0:28309/v2"
+            url = "http://localhost:28309/v2"
             repositoryId = "ci-test"
             branchName = "master"
         }
diff --git a/bulk-model-sync-gradle-test/ci.sh b/bulk-model-sync-gradle-test/ci.sh
@@ -25,7 +25,7 @@ sleep 5
 
 #CI needs more time
 if [ "${CI}" = "true" ]; then
-  sleep 10
+  sleep 20
 fi
 
 curl -X POST http://127.0.0.1:28309/v2/repositories/ci-test/init
diff --git a/bulk-model-sync-gradle-test/settings.gradle.kts b/bulk-model-sync-gradle-test/settings.gradle.kts
@@ -16,22 +16,58 @@
 
 pluginManagement {
     val modelixCoreVersion: String = file("../version.txt").readText()
+    val modelixRegex = "org\\.modelix.*"
     plugins {
         id("org.modelix.bulk-model-sync") version modelixCoreVersion
         id("org.modelix.model-api-gen") version modelixCoreVersion
     }
     repositories {
-        mavenLocal()
-        gradlePluginPortal()
-        maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-        mavenCentral()
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
     }
     dependencyResolutionManagement {
         repositories {
-            mavenLocal()
-            gradlePluginPortal()
-            maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-            mavenCentral()
+            mavenLocal {
+                content {
+                    includeGroupByRegex(modelixRegex)
+                }
+            }
+            gradlePluginPortal {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
+            maven {
+                url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+                content {
+                    includeGroupByRegex(modelixRegex)
+                    includeGroup("com.jetbrains")
+                }
+            }
+            mavenCentral {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
         }
         versionCatalogs {
             create("libs") {
diff --git a/bulk-model-sync-gradle/build.gradle.kts b/bulk-model-sync-gradle/build.gradle.kts
@@ -3,11 +3,6 @@ plugins {
     `java-gradle-plugin`
 }
 
-repositories {
-    mavenCentral()
-    mavenLocal()
-}
-
 dependencies {
     implementation(project(":model-client", "jvmRuntimeElements"))
     implementation(project(":bulk-model-sync-lib"))
diff --git a/bulk-model-sync-lib/build.gradle.kts b/bulk-model-sync-lib/build.gradle.kts
@@ -2,10 +2,6 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform)
 }
 
-repositories {
-    mavenCentral()
-}
-
 kotlin {
     js(IR) {
         browser()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,6 +19,9 @@ dokka = {id = "org.jetbrains.dokka", version = "1.9.10"}
 node = {id = "com.github.node-gradle.node", version = "7.0.1"}
 detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.4" }
 npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.1" }
+test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
+shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
+intellij = { id = "org.jetbrains.intellij", version = "1.16.1" }
 
 [versions]
 kotlin = "1.9.21"
diff --git a/kotlin-utils/build.gradle.kts b/kotlin-utils/build.gradle.kts
@@ -1,20 +1,18 @@
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
 }
 
 kotlin {
     jvm()
     js(IR) {
         browser {}
         nodejs {
-            testTask(
-                Action {
-                    useMocha {
-                        timeout = "30s"
-                    }
-                },
-            )
+            testTask {
+                useMocha {
+                    timeout = "30s"
+                }
+            }
         }
         useCommonJs()
     }
diff --git a/model-api-gen-gradle-test/build.gradle.kts b/model-api-gen-gradle-test/build.gradle.kts
@@ -7,6 +7,32 @@ plugins {
 }
 
 subprojects {
+    repositories {
+        val modelixRegex = "org\\.modelix.*"
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+                includeGroup("com.jetbrains")
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+    }
+
     plugins.withType<NodePlugin> {
         project.extensions.configure<NodeExtension> {
             version.set(libs.versions.node)
diff --git a/model-api-gen-gradle-test/settings.gradle.kts b/model-api-gen-gradle-test/settings.gradle.kts
@@ -1,22 +1,56 @@
 pluginManagement {
     val modelixCoreVersion: String = file("../version.txt").readText()
+    val modelixRegex = "org\\.modelix.*"
     plugins {
         id("org.modelix.model-api-gen") version modelixCoreVersion
     }
-    resolutionStrategy {
-    }
     repositories {
-        mavenLocal()
-        gradlePluginPortal()
-        maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-        mavenCentral()
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+                includeGroup("com.jetbrains")
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
     }
     dependencyResolutionManagement {
         repositories {
-            mavenLocal()
-            gradlePluginPortal()
-            maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
-            mavenCentral()
+            mavenLocal {
+                content {
+                    includeGroupByRegex(modelixRegex)
+                }
+            }
+            gradlePluginPortal {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
+            maven {
+                url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+                content {
+                    includeGroupByRegex(modelixRegex)
+                }
+            }
+            mavenCentral {
+                content {
+                    excludeGroupByRegex(modelixRegex)
+                }
+            }
         }
         versionCatalogs {
             create("libs") {
diff --git a/model-api-gen-gradle/build.gradle.kts b/model-api-gen-gradle/build.gradle.kts
@@ -5,12 +5,7 @@ plugins {
     java
 
     // Apply the Kotlin JVM plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm")
-}
-
-repositories {
-    // Use Maven Central for resolving dependencies.
-    mavenCentral()
+    kotlin("jvm")
 }
 
 dependencies {
diff --git a/model-api/build.gradle.kts b/model-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("maven-publish")
-    id("org.jetbrains.kotlin.multiplatform")
+    `maven-publish`
+    kotlin("multiplatform")
     kotlin("plugin.serialization")
 }
 
diff --git a/model-client/build.gradle.kts b/model-client/build.gradle.kts
@@ -2,11 +2,11 @@ import dev.petuska.npm.publish.task.NpmPackTask
 
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
-    id("com.diffplug.spotless")
+    kotlin("multiplatform")
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.npm.publish)
     `java-library`
     jacoco
-    alias(libs.plugins.npm.publish)
 }
 
 java {
diff --git a/model-datastructure/build.gradle.kts b/model-datastructure/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `maven-publish`
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
 }
 
 kotlin {
diff --git a/model-server/build.gradle.kts b/model-server/build.gradle.kts
@@ -3,11 +3,11 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTra
 
 plugins {
     application
-    id("com.diffplug.spotless")
     `maven-publish`
-    id("com.adarshr.test-logger") version "4.0.0"
-    id("org.jetbrains.kotlin.jvm")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    alias(libs.plugins.spotless)
+    alias(libs.plugins.test.logger)
+    alias(libs.plugins.shadow)
+    kotlin("jvm")
     kotlin("plugin.serialization")
 }
 
diff --git a/mps-model-server-plugin/build.gradle.kts b/mps-model-server-plugin/build.gradle.kts
@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.intellij") version "1.16.1"
+    kotlin("jvm")
+    alias(libs.plugins.intellij)
 }
 
 val mpsToIdeaMap = mapOf(
diff --git a/settings.gradle.kts b/settings.gradle.kts
diff --git a/ts-model-api/build.gradle.kts b/ts-model-api/build.gradle.kts
