Merge pull request #705 from modelix/build/deduplicate-repositories

mhuster23 · web-flow · commit 6c9d895068ab · 2024-04-22T09:23:43.000+02:00
MODELIX-875 Deduplicate repository declarations
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * 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.
+ */
+dependencyResolutionManagement {
+    repositories.gradlePluginPortal()
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/modelix-project-repositories.gradle.kts b/build-logic/src/main/kotlin/modelix-project-repositories.gradle.kts
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * 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.
+ */
+
+// For some projects we need to redeclare repositories on project level
+// because plugins like npm and intellij may override our settings
+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)
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/modelix-repositories.settings.gradle.kts b/build-logic/src/main/kotlin/modelix-repositories.settings.gradle.kts
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * 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.
+ */
+
+val modelixRegex = "org\\.modelix.*"
+pluginManagement {
+    repositories {
+        mavenLocal {
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+            }
+        }
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+    repositories {
+        gradlePluginPortal {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        mavenCentral {
+            content {
+                excludeGroupByRegex(modelixRegex)
+            }
+        }
+        maven {
+            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+            content {
+                includeGroupByRegex(modelixRegex)
+                includeGroup("com.jetbrains")
+            }
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/org/modelix/CopyMps.kt b/build-logic/src/main/kotlin/org/modelix/CopyMps.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -171,27 +171,6 @@ subprojects {
 }
 
 allprojects {
-    repositories {
-        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 {
         repositories {
             maven {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/bulk-model-sync-gradle-test/build.gradle.kts b/bulk-model-sync-gradle-test/build.gradle.kts
@@ -19,27 +19,6 @@ plugins {
     id("org.modelix.bulk-model-sync")
 }
 
-repositories {
-    val modelixRegex = "org\\.modelix.*"
-    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() }
 
 dependencies {
diff --git a/bulk-model-sync-gradle-test/settings.gradle.kts b/bulk-model-sync-gradle-test/settings.gradle.kts
@@ -16,52 +16,19 @@
 
 pluginManagement {
     includeBuild("..")
-    val modelixRegex = "org\\.modelix.*"
-    repositories {
-        gradlePluginPortal {
-            content {
-                excludeGroupByRegex(modelixRegex)
-            }
-        }
-        maven {
-            url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
-            content {
-                includeGroupByRegex(modelixRegex)
-            }
-        }
-        mavenCentral {
-            content {
-                excludeGroupByRegex(modelixRegex)
-            }
-        }
-    }
+    includeBuild("../build-logic")
     dependencyResolutionManagement {
         versionCatalogs {
             create("libs") {
                 from(files("../gradle/libs.versions.toml"))
             }
         }
-        repositories {
-            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 {
+    id("modelix-repositories")
+}
+
 includeBuild("..")
 include("graph-lang-api")
diff --git a/model-api-gen-gradle-test/build.gradle.kts b/model-api-gen-gradle-test/build.gradle.kts
@@ -7,32 +7,6 @@ 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,65 +1,19 @@
 pluginManagement {
-    val modelixCoreVersion: String = file("../version.txt").readText()
-    val modelixRegex = "org\\.modelix.*"
-    plugins {
-        id("org.modelix.model-api-gen") version modelixCoreVersion
-    }
-    repositories {
-        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)
-            }
-        }
-    }
+    includeBuild("..")
+    includeBuild("../build-logic")
     dependencyResolutionManagement {
-        repositories {
-            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") {
-                from("org.modelix:core-version-catalog:$modelixCoreVersion")
+                from(files("../gradle/libs.versions.toml"))
             }
         }
     }
 }
 
+plugins {
+    id("modelix-repositories")
+}
+
 rootProject.name = "model-api-gen-gradle-test"
 include("metamodel-export")
 include("typescript-generation")
diff --git a/mps-model-adapters-plugin/build.gradle.kts b/mps-model-adapters-plugin/build.gradle.kts
@@ -4,6 +4,7 @@ import org.modelix.mpsJavaVersion
 plugins {
     kotlin("jvm")
     alias(libs.plugins.intellij)
+    id("modelix-project-repositories")
 }
 
 dependencies {
diff --git a/mps-model-server-plugin/build.gradle.kts b/mps-model-server-plugin/build.gradle.kts
@@ -4,6 +4,7 @@ import org.modelix.mpsHomeDir
 plugins {
     kotlin("jvm")
     alias(libs.plugins.intellij)
+    id("modelix-project-repositories")
 }
 
 dependencies {
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
diff --git a/vue-model-api/build.gradle.kts b/vue-model-api/build.gradle.kts
