Fix outstanding issues, clean up Gradle files

yfn020 · Dec 15, 2022 · 2595dcc · 2595dcc
1 parent fefd685
commit 2595dcc
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 328 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,10 +38,9 @@ jobs:
  - name: Run :check task
  run: ./gradlew check
  - name: Merge SARIF files into one
- uses: jduimovich/collect-sarif-files@main
+ uses: microsoft/sarif-[email protected]
  with:
- input-file-name: ${{ github.workspace }}/build/*.sarif
- output-file-name: ${{ github.workspace }}/build/static-analysis.sarif
+ command: merge --recurse --merge-runs ${{ github.workspace }}/build/*.sarif --output-directory=${{ github.workspace }}/build/ --output-file=static-analysis.sarif
 
  - uses: github/codeql-action/upload-sarif@v2
  with:

diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -23,15 +23,15 @@ gradlePlugin {
  plugins {
  register("jewelKotlin") {
  id = "org.jetbrains.jewel.kotlin"
- implementationClass = "org.jetbrains.jewel.buildlogic.convention.KotlinConventionPlugin"
+ implementationClass = "org.jetbrains.jewel.buildlogic.convention.JewelKotlinPlugin"
  }
  register("jewelDetekt") {
  id = "org.jetbrains.jewel.detekt"
- implementationClass = "org.jetbrains.jewel.buildlogic.convention.DetektConventionPlugin"
+ implementationClass = "org.jetbrains.jewel.buildlogic.convention.JewelDetektPlugin"
  }
  register("jewelKtlint") {
  id = "org.jetbrains.jewel.ktlint"
- implementationClass = "org.jetbrains.jewel.buildlogic.convention.KtlintConventionPlugin"
+ implementationClass = "org.jetbrains.jewel.buildlogic.convention.JewelKtlintPlugin"
  }
  }
 }
diff --git a/...ogic/convention/DetektConventionPlugin.kt → ...uildlogic/convention/JewelDetektPlugin.kt b/...ogic/convention/DetektConventionPlugin.kt → ...uildlogic/convention/JewelDetektPlugin.kt
@@ -6,10 +6,9 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
 
 @Suppress("unused") // Plugin entry point, see build.gradle.kts
-class DetektConventionPlugin : Plugin<Project> {
+class JewelDetektPlugin : Plugin<Project> {
 
  override fun apply(target: Project) {
  with(target) {
@@ -31,7 +30,7 @@ class DetektConventionPlugin : Plugin<Project> {
  tasks.withType<Detekt>().configureEach {
  reports {
  sarif.required.set(true)
- sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${archivesName}.sarif")))
+ sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${project.name}.sarif")))
  }
  }
  }

diff --git a/...ogic/convention/KotlinConventionPlugin.kt → ...uildlogic/convention/JewelKotlinPlugin.kt b/...ogic/convention/KotlinConventionPlugin.kt → ...uildlogic/convention/JewelKotlinPlugin.kt
@@ -6,13 +6,17 @@ import org.gradle.kotlin.dsl.getByType
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
 @Suppress("unused") // Plugin entry point, see build.gradle.kts
-class KotlinConventionPlugin : Plugin<Project> {
+class JewelKotlinPlugin : Plugin<Project> {
 
  override fun apply(target: Project) {
  with(target) {
  pluginManager.apply("org.jetbrains.kotlin.jvm")
  val extension = extensions.getByType<KotlinJvmProjectExtension>()
  configureExtension(extension)
+
+ // TODO move to a better place
+ group = "org.jetbrains.jewel"
+ version = "0.0.1-SNAPSHOT"
  }
  }
 

diff --git a/...ogic/convention/KtlintConventionPlugin.kt → ...uildlogic/convention/JewelKtlintPlugin.kt b/...ogic/convention/KtlintConventionPlugin.kt → ...uildlogic/convention/JewelKtlintPlugin.kt
@@ -4,12 +4,11 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
 import org.jmailen.gradle.kotlinter.KotlinterExtension
 import org.jmailen.gradle.kotlinter.tasks.LintTask
 
 @Suppress("unused") // Plugin entry point, see build.gradle.kts
-class KtlintConventionPlugin : Plugin<Project> {
+class JewelKtlintPlugin : Plugin<Project> {
 
  override fun apply(target: Project) {
  with(target) {
@@ -31,9 +30,9 @@ class KtlintConventionPlugin : Plugin<Project> {
  tasks.withType<LintTask>().configureEach {
  reports.set(
  mapOf(
- "plain" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.txt"),
- "html" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.html"),
- "sarif" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.sarif")
+ "plain" to rootDir.resolve("build/reports/ktlint-${project.name}.txt"),
+ "html" to rootDir.resolve("build/reports/ktlint-${project.name}.html"),
+ "sarif" to rootDir.resolve("build/reports/ktlint-${project.name}.sarif")
  )
  )
  }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,23 +1,5 @@
 plugins {
- id("org.jetbrains.jewel.kotlin") apply false
- alias(libs.plugins.composeDesktop) apply false
- alias(libs.plugins.ideaGradlePlugin) apply false
- alias(libs.plugins.kotlinSerialization) apply false
+ id("org.jetbrains.jewel.kotlin")
  id("org.jetbrains.jewel.detekt")
  id("org.jetbrains.jewel.ktlint")
 }
-
-
-allprojects {
- group = "org.jetbrains.jewel"
- version = "0.1-SNAPSHOT"
-
- // TODO do we still need this? See issue #24
- configurations.all {
- resolutionStrategy.dependencySubstitution {
- substitute(module("org.jetbrains.compose.compiler:compiler")).apply {
- using(module("androidx.compose.compiler:compiler:1.2.1-dev-k1.7.10-27cf0868d10"))
- }
- }
- }
-}
diff --git a/compose-utils/build.gradle.kts b/compose-utils/build.gradle.kts
@@ -1,7 +1,3 @@
-import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
-import org.jmailen.gradle.kotlinter.tasks.LintTask
-
 plugins {
  id("org.jetbrains.jewel.kotlin")
  alias(libs.plugins.composeDesktop)
@@ -16,16 +12,3 @@ dependencies {
  implementation(libs.jna)
  implementation(libs.kotlinx.serialization.json)
 }
-
-tasks.withType<Detekt>().configureEach {
- reports {
- sarif.required.set(true)
- sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${project.archivesName}.sarif")))
- }
-}
-
-tasks.withType<LintTask>().configureEach {
- reports.set(mapOf("plain" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.txt")))
- reports.set(mapOf("html" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.html")))
- reports.set(mapOf("sarif" to rootDir.resolve("build/reports/ktlint-${project.archivesName}.sarif")))
-}
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2G
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ composeDesktop = "1.2.1"
 coroutines = "1.6.0"
 detekt = "1.22.0"
 idea = "223.7571.203"
-ideaGradlePlugin = "1.11.0-SNAPSHOT"
+ideaGradlePlugin = "1.10.1"
 jna = "5.10.0"
 kotlin = "1.7.10"
 kotlinterGradlePlugin = "3.12.0"

diff --git a/samples/ide-plugin/build.gradle.kts b/samples/ide-plugin/build.gradle.kts
@@ -1,6 +1,3 @@
-import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
-
 plugins {
  id("org.jetbrains.jewel.kotlin")
  alias(libs.plugins.composeDesktop)
@@ -9,36 +6,15 @@ plugins {
  id("org.jetbrains.jewel.ktlint")
 }
 
-detekt {
- config = files(File(rootDir, "detekt.yml"))
- buildUponDefaultConfig = true
-}
-
-kotlin {
- target {
- compilations.all {
- kotlinOptions {
- jvmTarget = "17"
- freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
- }
- }
- }
- sourceSets {
- all {
- languageSettings.optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
- languageSettings.optIn("kotlin.experimental.ExperimentalTypeInference")
- languageSettings.optIn("androidx.compose.ui.ExperimentalComposeUiApi")
- }
- }
-}
-
 intellij {
  pluginName.set("Jewel")
  version.set("LATEST-EAP-SNAPSHOT")
  plugins.set(listOf("org.jetbrains.kotlin"))
- version.set("2022.3") // IJ 22.3 RC2
+ version.set("2022.3")
 }
 
+// TODO remove this once the IJ Gradle plugin fixes their repositories bug
+// See https://github.com/JetBrains/gradle-intellij-plugin/issues/776
 repositories {
  maven("https://androidx.dev/storage/compose-compiler/repository/")
  maven("https://www.jetbrains.com/intellij-repository/releases")
@@ -49,10 +25,3 @@ repositories {
 dependencies {
  implementation(projects.themes.darcula.darculaIde)
 }
-
-tasks.named<Detekt>("detekt").configure {
- reports {
- sarif.required.set(true)
- sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${project.archivesName}.sarif")))
- }
-}
diff --git a/samples/standalone-new-ui/build.gradle.kts b/samples/standalone-new-ui/build.gradle.kts
@@ -1,6 +1,4 @@
-import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
 
 plugins {
  id("org.jetbrains.jewel.kotlin")
@@ -9,29 +7,6 @@ plugins {
  id("org.jetbrains.jewel.ktlint")
 }
 
-detekt {
- config = files(File(rootDir, "detekt.yml"))
- buildUponDefaultConfig = true
-}
-
-kotlin {
- target {
- compilations.all {
- kotlinOptions {
- jvmTarget = "17"
- }
- }
- }
- sourceSets {
- all {
- languageSettings {
- optIn("kotlin.time.ExperimentalTime")
- optIn("androidx.compose.foundation.ExperimentalFoundationApi")
- }
- }
- }
-}
-
 dependencies {
  implementation(projects.themes.newUi.newUiDesktop)
  implementation(libs.compose.components.splitpane)
@@ -49,10 +24,3 @@ compose.desktop {
  }
  }
 }
-
-tasks.named<Detekt>("detekt").configure {
- reports {
- sarif.required.set(true)
- sarif.outputLocation.set(file(File(rootDir, "build/reports/detekt-${project.archivesName}.sarif")))
- }
-}
diff --git a/samples/standalone/build.gradle.kts b/samples/standalone/build.gradle.kts
@@ -1,6 +1,4 @@
-import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
 
 plugins {
  id("org.jetbrains.jewel.kotlin")
@@ -9,29 +7,6 @@ plugins {
  id("org.jetbrains.jewel.ktlint")
 }
 
-detekt {
- config = files(File(rootDir, "detekt.yml"))
- buildUponDefaultConfig = true
-}
-
-kotlin {
- target {
- compilations.all {
- kotlinOptions {
- jvmTarget = "17"
- }
- }
- }
- sourceSets {
- all {
- languageSettings {
- optIn("kotlin.time.ExperimentalTime")
- optIn("androidx.compose.foundation.ExperimentalFoundationApi")
- }
- }
- }
-}
-
 dependencies {
  implementation(projects.themes.darcula.darculaStandalone)
  implementation(libs.compose.components.splitpane)
@@ -49,10 +24,3 @@ compose.desktop {
  }
  }
 }
-
-tasks.named<Detekt>("detekt").configure {
- reports {
- sarif.required.set(true)
- sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${project.archivesName}.sarif")))
- }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,6 @@ pluginManagement {
  gradlePluginPortal()
  maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
  maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
- maven("https://oss.sonatype.org/content/repositories/snapshots/")
  mavenCentral()
  }
 }
@@ -19,6 +18,8 @@ dependencyResolutionManagement {
  google()
  maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
  maven("https://androidx.dev/storage/compose-compiler/repository/")
+ maven("https://www.jetbrains.com/intellij-repository/releases")
+ maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
  mavenCentral()
  }
 }

diff --git a/themes/darcula/darcula-ide/build.gradle.kts b/themes/darcula/darcula-ide/build.gradle.kts
@@ -1,52 +1,11 @@
-import io.gitlab.arturbosch.detekt.Detekt
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.archivesName
-
 plugins {
  id("org.jetbrains.jewel.kotlin")
  alias(libs.plugins.composeDesktop)
  id("org.jetbrains.jewel.detekt")
  id("org.jetbrains.jewel.ktlint")
 }
 
-detekt {
- config = files(File(rootDir, "detekt.yml"))
- buildUponDefaultConfig = true
-}
-
-kotlin {
- target {
- compilations.all {
- kotlinOptions {
- jvmTarget = "17"
- }
- }
- }
- sourceSets {
- all {
- languageSettings {
- optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
- optIn("kotlin.experimental.ExperimentalTypeInference")
- optIn("androidx.compose.ui.ExperimentalComposeUiApi")
- }
- }
- }
-}
-
-repositories {
- maven("https://androidx.dev/storage/compose-compiler/repository/")
- maven("https://www.jetbrains.com/intellij-repository/releases")
- maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
- mavenCentral()
-}
-
 dependencies {
  api(projects.themes.darcula.darculaStandalone)
  compileOnly(libs.bundles.idea)
 }
-
-tasks.named<Detekt>("detekt").configure {
- reports {
- sarif.required.set(true)
- sarif.outputLocation.set(file(rootDir.resolve("build/reports/detekt-${project.archivesName}.sarif")))
- }
-}