Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify build to use published version catalog and convention plugin #266

Merged
merged 3 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
id("com.mikepenz.kotlin.multiplatform")
id("com.mikepenz.compose")
id("com.mikepenz.convention.kotlin-multiplatform")
id("com.mikepenz.convention.compose")
id("com.mikepenz.aboutlibraries.plugin")
}

group = "com.mikepenz"
version = "1.0.0"


kotlin {
jvm()

Expand All @@ -34,13 +33,13 @@ kotlin {
implementation(compose.material)

// about libs
implementation(libs.bundles.aboutlibs)
implementation(baseLibs.bundles.aboutlibs)

// required for coil
implementation(libs.coil.network.ktor)
implementation(libs.ktor.client.core)
implementation(libs.ktor.client.java)
implementation(libs.kotlinx.coroutines.swing)
implementation(baseLibs.kotlinx.coroutines.swing)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app-desktop/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.mikepenz.multiplatform.enabled=true
org.mikepenz.targets.enabled=false
com.mikepenz.multiplatform.enabled=true
com.mikepenz.targets.enabled=false
6 changes: 3 additions & 3 deletions app-wasm/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl

plugins {
id("com.mikepenz.kotlin.multiplatform")
id("com.mikepenz.compose")
id("com.mikepenz.convention.kotlin-multiplatform")
id("com.mikepenz.convention.compose")
id("com.mikepenz.aboutlibraries.plugin")
}

Expand Down Expand Up @@ -33,7 +33,7 @@ kotlin {
implementation(compose.foundation)
implementation(compose.material3)

implementation(libs.bundles.aboutlibs)
implementation(baseLibs.bundles.aboutlibs)

implementation(projects.multiplatformMarkdownRenderer)
implementation(projects.multiplatformMarkdownRendererM3)
Expand Down
2 changes: 1 addition & 1 deletion app-wasm/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.mikepenz.targets.enabled=false
com.mikepenz.targets.enabled=false
8 changes: 4 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import org.jetbrains.kotlin.konan.properties.Properties

plugins {
kotlin("android")
id("com.mikepenz.android.application")
id("com.mikepenz.kotlin.multiplatform")
id("com.mikepenz.compose")
id("com.mikepenz.convention.android-application")
id("com.mikepenz.convention.kotlin-multiplatform")
id("com.mikepenz.convention.compose")
id("com.mikepenz.aboutlibraries.plugin")
alias(libs.plugins.screenshot)
alias(baseLibs.plugins.screenshot)
}

if (openSourceSigningFile != null) {
Expand Down
4 changes: 2 additions & 2 deletions app/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.mikepenz.multiplatform.enabled=false
org.mikepenz.targets.enabled=false
com.mikepenz.multiplatform.enabled=false
com.mikepenz.targets.enabled=false
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id("com.mikepenz.root")
alias(libs.plugins.conventionPlugin)

// this is necessary to avoid the plugins to be loaded multiple times in each subproject's classloader
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.composeMultiplatform) apply false
alias(libs.plugins.composeCompiler) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.dokka)
alias(libs.plugins.aboutlibraries) apply false
alias(libs.plugins.mavenPublish) apply false
alias(baseLibs.plugins.androidApplication) apply false
alias(baseLibs.plugins.androidLibrary) apply false
alias(baseLibs.plugins.composeMultiplatform) apply false
alias(baseLibs.plugins.composeCompiler) apply false
alias(baseLibs.plugins.kotlinMultiplatform) apply false
alias(baseLibs.plugins.dokka)
alias(baseLibs.plugins.aboutlibraries) apply false
alias(baseLibs.plugins.mavenPublish) apply false
}

allprojects {
Expand Down
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,4 @@ android.experimental.enableScreenshotTest=true

# Dokka
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true


test=test3
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
57 changes: 0 additions & 57 deletions gradle/build-logic/convention/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading