Merge in build changes from main

The markdown modules should only live on main for now. Also restore run configs that were missing for branch.
JetBrains · Feb 14, 2024 · 0db5e54 · 0db5e54
1 parent 20cb957
commit 0db5e54
Show file tree

Hide file tree

Showing 40 changed files with 38 additions and 18,045 deletions.
diff --git a/.idea/runConfigurations/IDE_sample.xml b/.idea/runConfigurations/IDE_sample.xml
diff --git a/...a/runConfigurations/Regenerate_themes.xml → .idea/runConfigurations/Run_checks.xml b/...a/runConfigurations/Regenerate_themes.xml → .idea/runConfigurations/Run_checks.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,8 +6,6 @@ plugins {
 dependencies {
     sarif(projects.foundation)
     sarif(projects.ideLafBridge)
-    sarif(projects.markdown.core)
-    sarif(projects.markdown.extensionGfmAlerts)
     sarif(projects.samples.idePlugin)
     sarif(projects.ui)
 }

diff --git a/buildSrc/src/main/kotlin/PublishConfiguration.kt b/buildSrc/src/main/kotlin/PublishConfiguration.kt
@@ -1,11 +1,13 @@
 @file:Suppress("UnstableApiUsage", "UnusedImports")
 
+import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPom
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.maven
+import java.io.File
 
-internal fun PublishingExtension.configureJewelRepositories() {
+internal fun PublishingExtension.configureJewelRepositories(project: Project) {
     repositories {
         maven("https://packages.jetbrains.team/maven/p/kpm/public") {
             name = "Space"
@@ -14,6 +16,10 @@ internal fun PublishingExtension.configureJewelRepositories() {
                 password = System.getenv("MAVEN_SPACE_PASSWORD")
             }
         }
+
+        maven(project.rootProject.layout.buildDirectory.dir("maven-test")) {
+            name = "LocalTest"
+        }
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/jewel-publish.gradle.kts b/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
@@ -19,14 +19,14 @@ val javadocJar by tasks.registering(Jar::class) {
 }
 
 publishing {
-    configureJewelRepositories()
+    configureJewelRepositories(project)
 
     publications {
         register<MavenPublication>("main") {
             from(components["kotlin"])
             artifact(javadocJar)
             artifact(sourcesJar)
-            version = project.version.toString()
+            version = project.properties["jewel.release.version"] as String
             artifactId = "jewel-${project.name}"
             pom { configureJewelPom() }
         }

diff --git a/foundation/build.gradle.kts b/foundation/build.gradle.kts
@@ -2,7 +2,6 @@ import org.jetbrains.compose.ComposeBuildConfig
 
 plugins {
     jewel
-    `jewel-publish`
     `jewel-check-public-api`
     alias(libs.plugins.composeDesktop)
 }

diff --git a/gradle.properties b/gradle.properties
@@ -7,3 +7,4 @@ kotlin.stdlib.default.dependency=false
 kotlin.incremental.useClasspathSnapshot=false
 
 bridge.ijp.target=232
+jewel.release.version=0.14.0
diff --git a/markdown/README.md b/markdown/README.md
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ kotlin.stdlib.default.dependency=false
		kotlin.incremental.useClasspathSnapshot=false

		bridge.ijp.target=232
		jewel.release.version=0.14.0