From cf2e5f9b481fd1e4be91d7185353e0cb674110be Mon Sep 17 00:00:00 2001 From: Mateusz Suchowiecki Date: Mon, 22 Aug 2022 15:04:48 +0200 Subject: [PATCH 01/12] Add gradle publishing setup --- .../charts/extensions/BuildUtil.kt | 5 ++ .../charts/extensions/PublishingSetup.kt | 59 +++++++++++++++++++ charts/build.gradle.kts | 9 +++ gradle/libs.versions.toml | 6 +- 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/BuildUtil.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/BuildUtil.kt index b3540ff..409846f 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/BuildUtil.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/BuildUtil.kt @@ -3,6 +3,7 @@ package com.netguru.multiplatform.charts.extensions import com.android.build.gradle.BaseExtension import org.gradle.api.NamedDomainObjectContainer import org.gradle.api.Project +import org.gradle.api.publish.PublishingExtension import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet @@ -15,6 +16,10 @@ fun Project.kotlin(block: KotlinMultiplatformExtension.() -> Unit) { extensions.getByType().block() } +fun Project.publishing(block: PublishingExtension.() -> Unit) { + extensions.getByType().block() +} + typealias SourceSets = NamedDomainObjectContainer fun KotlinMultiplatformExtension.sourceSets(block: SourceSets.() -> Unit) { diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt new file mode 100644 index 0000000..7798603 --- /dev/null +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -0,0 +1,59 @@ +package com.netguru.multiplatform.charts.extensions + +import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.Project +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.kotlin.dsl.extra +import org.gradle.kotlin.dsl.the + +fun Project.publishingSetup() { + val libs = project.the() + + val version = if (project.extra.has("libVersion")) { + project.extra.get("libVersion") + .let { it as String } + .run { if (startsWith("v")) drop(1) else this } + } else { + libs.versions.project.version.get() + } + + project.group = libs.versions.project.group.get() + project.version = version + + project.extra["signing.keyId"] = System.getenv("SIGNING_KEY_ID") + project.extra["signing.password"] = System.getenv("SIGNING_PASSWORD") + project.extra["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE") + project.extra["ossrhUsername"] = System.getenv("OSSRH_USERNAME") + project.extra["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") + + publishing { + repositories { + maven { + name = "sonatype" + setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") + credentials { + username = System.getenv("OSSRH_USERNAME") + password = System.getenv("OSSRH_PASSWORD") + } + } + } + + publications.withType(MavenPublication::class.java) { + pom { + name.set(libs.versions.project.name.get()) + description.set(libs.versions.project.description.get()) + url.set(libs.versions.project.url.get()) + + licenses { + license { + name.set("MIT") + url.set("https://opensource.org/licenses/MIT") + } + } + scm { + url.set(libs.versions.project.url.get()) + } + } + } + } +} diff --git a/charts/build.gradle.kts b/charts/build.gradle.kts index 0c6b88f..2ea5f8f 100644 --- a/charts/build.gradle.kts +++ b/charts/build.gradle.kts @@ -2,17 +2,21 @@ import com.netguru.multiplatform.charts.extensions.baseAndroidSetup import com.netguru.multiplatform.charts.extensions.commonMain import com.netguru.multiplatform.charts.extensions.commonTest import com.netguru.multiplatform.charts.extensions.kotlin +import com.netguru.multiplatform.charts.extensions.publishingSetup import com.netguru.multiplatform.charts.extensions.sourceSets import org.jetbrains.compose.compose import java.net.URL baseAndroidSetup() +publishingSetup() plugins { alias(libs.plugins.compose) kotlin("multiplatform") id("com.android.library") alias(libs.plugins.dokka) + `maven-publish` + signing } kotlin { @@ -37,6 +41,11 @@ kotlin { } } +signing { + // Uncomment when the signing will be possible + // sign(publishing.publications) +} + tasks.withType().configureEach { dokkaSourceSets { named("commonMain") { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9dfc35d..a26ebbb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,9 +36,11 @@ shot = "5.14.1" ktlint = "10.2.1" # Project -project-group = "com.netguru" -project-version = "0.1" +project-group = "com.netguru.multiplatform" +project-version = "1.0.0" project-name = "Compose Multiplatform Charts" +project-description = "Charts library for Kotlin multiplatform applications" +project-url = "https://github.com/netguru/compose-multiplatform-charts" [libraries] From 9005fd20bfd2ab080cbd18398c5527f99ea32619 Mon Sep 17 00:00:00 2001 From: dh-mmalek Date: Wed, 15 Feb 2023 14:09:08 +0100 Subject: [PATCH 02/12] Update artifactId and group --- .../netguru/multiplatform/charts/extensions/PublishingSetup.kt | 1 + gradle/libs.versions.toml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index 7798603..d6fc085 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -40,6 +40,7 @@ fun Project.publishingSetup() { publications.withType(MavenPublication::class.java) { pom { + artifactId = libs.versions.project.artifact.get() name.set(libs.versions.project.name.get()) description.set(libs.versions.project.description.get()) url.set(libs.versions.project.url.get()) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a26ebbb..7d36936 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,8 @@ shot = "5.14.1" ktlint = "10.2.1" # Project -project-group = "com.netguru.multiplatform" +project-group = "com.netguru" +project-artifact = "multiplatform-charts" project-version = "1.0.0" project-name = "Compose Multiplatform Charts" project-description = "Charts library for Kotlin multiplatform applications" From 9a21795e0b3cbfc331acbdfd2c403dc52f4fcd4b Mon Sep 17 00:00:00 2001 From: mmalek Date: Thu, 9 Mar 2023 09:52:57 +0100 Subject: [PATCH 03/12] update publishing script --- .../charts/extensions/PublishingSetup.kt | 32 +++++++++++++------ charts/build.gradle.kts | 7 ++-- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index d6fc085..db1cd50 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -5,6 +5,7 @@ import org.gradle.api.Project import org.gradle.api.publish.maven.MavenPublication import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.the +import java.util.* fun Project.publishingSetup() { val libs = project.the() @@ -20,11 +21,26 @@ fun Project.publishingSetup() { project.group = libs.versions.project.group.get() project.version = version - project.extra["signing.keyId"] = System.getenv("SIGNING_KEY_ID") - project.extra["signing.password"] = System.getenv("SIGNING_PASSWORD") - project.extra["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE") - project.extra["ossrhUsername"] = System.getenv("OSSRH_USERNAME") - project.extra["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") + val secretPropsFile = project.rootProject.file("local.properties") + if (secretPropsFile.exists()) { + secretPropsFile.reader().use { + Properties().apply { + load(it) + } + }.let { properties -> + project.extra["signing.keyId"] = properties.getProperty("signing.keyId") + project.extra["signing.password"] = properties.getProperty("signing.password") + project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") + project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") + project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") + } + } else { + project.extra["signing.keyId"] = System.getenv("SIGNING_KEY_ID") + project.extra["signing.password"] = System.getenv("SIGNING_PASSWORD") + project.extra["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE") + project.extra["ossrhUsername"] = System.getenv("OSSRH_USERNAME") + project.extra["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") + } publishing { repositories { @@ -32,16 +48,14 @@ fun Project.publishingSetup() { name = "sonatype" setUrl("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") credentials { - username = System.getenv("OSSRH_USERNAME") - password = System.getenv("OSSRH_PASSWORD") + username = project.extra["ossrhUsername"]?.toString() + password = project.extra["ossrhPassword"]?.toString() } } } publications.withType(MavenPublication::class.java) { pom { - artifactId = libs.versions.project.artifact.get() - name.set(libs.versions.project.name.get()) description.set(libs.versions.project.description.get()) url.set(libs.versions.project.url.get()) diff --git a/charts/build.gradle.kts b/charts/build.gradle.kts index 2ea5f8f..73bf4ff 100644 --- a/charts/build.gradle.kts +++ b/charts/build.gradle.kts @@ -20,7 +20,9 @@ plugins { } kotlin { - android() + android { + publishLibraryVariants("release", "debug") + } jvm("desktop") sourceSets { @@ -42,8 +44,7 @@ kotlin { } signing { - // Uncomment when the signing will be possible - // sign(publishing.publications) + sign(publishing.publications) } tasks.withType().configureEach { From 861bd31e8b05ff280180070c05f4daa0a6fd8071 Mon Sep 17 00:00:00 2001 From: mmalek Date: Thu, 9 Mar 2023 12:47:59 +0100 Subject: [PATCH 04/12] rollback name in pom --- .../netguru/multiplatform/charts/extensions/PublishingSetup.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index db1cd50..7350c62 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -56,6 +56,7 @@ fun Project.publishingSetup() { publications.withType(MavenPublication::class.java) { pom { + name.set(libs.versions.project.name.get()) description.set(libs.versions.project.description.get()) url.set(libs.versions.project.url.get()) From 4b63d35cb88c94defdeda143978776df185ecea1 Mon Sep 17 00:00:00 2001 From: mmalek Date: Thu, 9 Mar 2023 13:00:36 +0100 Subject: [PATCH 05/12] rename library module --- example-app/common/build.gradle.kts | 2 +- {charts => multiplatform-charts}/build.gradle.kts | 0 .../src/androidMain/AndroidManifest.xml | 0 .../kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt | 0 .../kotlin/com/netguru/multiplatform/charts/Helpers.kt | 0 .../com/netguru/multiplatform/charts/OverlayInformation.kt | 0 .../kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt | 0 .../kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartCategory.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartColors.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartConfig.kt | 0 .../kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartDefaults.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartDrawing.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartEntry.kt | 0 .../com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt | 0 .../kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt | 0 .../com/netguru/multiplatform/charts/bubble/BubbleChart.kt | 0 .../com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt | 0 .../com/netguru/multiplatform/charts/bubble/BubblePacking.kt | 0 .../kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt | 0 .../kotlin/com/netguru/multiplatform/charts/dial/Dial.kt | 0 .../kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt | 0 .../kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt | 0 .../com/netguru/multiplatform/charts/dial/DialDefaults.kt | 0 .../com/netguru/multiplatform/charts/dial/PercentageDial.kt | 0 .../com/netguru/multiplatform/charts/gasbottle/GasBottle.kt | 0 .../netguru/multiplatform/charts/gasbottle/GasBottleColors.kt | 0 .../com/netguru/multiplatform/charts/gasbottle/GasTank.kt | 0 .../kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt | 0 .../kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt | 0 .../com/netguru/multiplatform/charts/grid/GridChartData.kt | 0 .../com/netguru/multiplatform/charts/grid/GridChartDrawing.kt | 0 .../com/netguru/multiplatform/charts/grid/GridDefaults.kt | 0 .../com/netguru/multiplatform/charts/grid/LineParameters.kt | 0 .../multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt | 0 .../multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt | 0 .../netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt | 0 .../netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt | 0 .../kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt | 0 .../kotlin/com/netguru/multiplatform/charts/line/Line.kt | 0 .../kotlin/com/netguru/multiplatform/charts/line/LineChart.kt | 0 .../com/netguru/multiplatform/charts/line/LineChartColors.kt | 0 .../multiplatform/charts/line/LineChartOverlayInformation.kt | 0 .../com/netguru/multiplatform/charts/line/LineChartSeries.kt | 0 .../netguru/multiplatform/charts/line/LineChartWithLegend.kt | 0 .../kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt | 0 .../com/netguru/multiplatform/charts/pie/PieChartConfig.kt | 0 .../com/netguru/multiplatform/charts/pie/PieChartLegend.kt | 0 .../com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt | 0 .../kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt | 0 .../com/netguru/multiplatform/charts/theme/ChartColors.kt | 0 .../com/netguru/multiplatform/charts/theme/ChartDefaults.kt | 0 .../kotlin/com/netguru/multiplatform/charts/theme/Theme.kt | 0 settings.gradle.kts | 2 +- 55 files changed, 2 insertions(+), 2 deletions(-) rename {charts => multiplatform-charts}/build.gradle.kts (100%) rename {charts => multiplatform-charts}/src/androidMain/AndroidManifest.xml (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/Helpers.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/OverlayInformation.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartCategory.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartColors.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartConfig.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDrawing.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartEntry.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleChart.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubblePacking.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/Dial.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/PercentageDial.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottle.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottleColors.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasTank.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartData.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartDrawing.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/LineParameters.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/Line.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChart.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartColors.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartOverlayInformation.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartSeries.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartWithLegend.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartConfig.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartColors.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartDefaults.kt (100%) rename {charts => multiplatform-charts}/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/Theme.kt (100%) diff --git a/example-app/common/build.gradle.kts b/example-app/common/build.gradle.kts index 7a55d82..42db76f 100644 --- a/example-app/common/build.gradle.kts +++ b/example-app/common/build.gradle.kts @@ -29,7 +29,7 @@ kotlin { api(compose.material) api(compose.materialIconsExtended) api(libs.time.klock) - api(project(":charts")) + api(project(":multiplatform-charts")) } } androidMain { diff --git a/charts/build.gradle.kts b/multiplatform-charts/build.gradle.kts similarity index 100% rename from charts/build.gradle.kts rename to multiplatform-charts/build.gradle.kts diff --git a/charts/src/androidMain/AndroidManifest.xml b/multiplatform-charts/src/androidMain/AndroidManifest.xml similarity index 100% rename from charts/src/androidMain/AndroidManifest.xml rename to multiplatform-charts/src/androidMain/AndroidManifest.xml diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/ChartAnimation.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/Helpers.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/Helpers.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/Helpers.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/Helpers.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/OverlayInformation.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/OverlayInformation.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/OverlayInformation.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/OverlayInformation.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChart.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartBar.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartCategory.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartCategory.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartCategory.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartCategory.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartColors.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartColors.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartColors.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartColors.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartConfig.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartConfig.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartConfig.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartConfig.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartData.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDrawing.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDrawing.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDrawing.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartDrawing.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartEntry.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartEntry.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartEntry.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartEntry.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bar/BarChartWithLegend.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Bubble.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleChart.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleChart.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleChart.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleChart.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubbleDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubblePacking.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubblePacking.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubblePacking.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/BubblePacking.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/bubble/Vector.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/Dial.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/Dial.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/Dial.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/Dial.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialColors.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialConfig.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/DialDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/PercentageDial.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/PercentageDial.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/PercentageDial.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/dial/PercentageDial.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottle.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottle.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottle.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottle.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottleColors.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottleColors.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottleColors.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasBottleColors.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasTank.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasTank.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasTank.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/gasbottle/GasTank.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartAxis.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/ChartGrid.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartData.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartData.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartData.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartData.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartDrawing.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartDrawing.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartDrawing.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridChartDrawing.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/GridDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/LineParameters.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/LineParameters.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/LineParameters.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/LineParameters.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/FixedTicksXAxisScale.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/TimestampXAxisScale.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/XAxisScale.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/grid/axisscale/YAxisScale.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/ChartLegend.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/Line.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/Line.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/Line.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/Line.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChart.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChart.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChart.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChart.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartColors.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartColors.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartColors.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartColors.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartOverlayInformation.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartOverlayInformation.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartOverlayInformation.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartOverlayInformation.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartSeries.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartSeries.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartSeries.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartSeries.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartWithLegend.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartWithLegend.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartWithLegend.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/line/LineChartWithLegend.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChart.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartConfig.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartConfig.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartConfig.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartConfig.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartLegend.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieChartWithLegend.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/pie/PieDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartColors.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartColors.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartColors.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartColors.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartDefaults.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartDefaults.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartDefaults.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/ChartDefaults.kt diff --git a/charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/Theme.kt b/multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/Theme.kt similarity index 100% rename from charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/Theme.kt rename to multiplatform-charts/src/commonMain/kotlin/com/netguru/multiplatform/charts/theme/Theme.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 912b26c..14bbf01 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,7 +10,7 @@ rootProject.name = "compose-multiplatform-charts" enableFeaturePreview("VERSION_CATALOGS") -include(":charts") +include(":multiplatform-charts") include(":example-app:application") include(":example-app:common") include(":example-app:android") From 3535c4b25f46b22c1ab44af5ea62f23de0d3fe2e Mon Sep 17 00:00:00 2001 From: mmalek Date: Thu, 9 Mar 2023 13:36:16 +0100 Subject: [PATCH 06/12] fix lint --- multiplatform-charts/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multiplatform-charts/build.gradle.kts b/multiplatform-charts/build.gradle.kts index 73bf4ff..969d2dd 100644 --- a/multiplatform-charts/build.gradle.kts +++ b/multiplatform-charts/build.gradle.kts @@ -44,7 +44,7 @@ kotlin { } signing { - sign(publishing.publications) + sign(publishing.publications) } tasks.withType().configureEach { From 51d84282479b11889c15acee3eba45f956b9cb7a Mon Sep 17 00:00:00 2001 From: mmalek Date: Thu, 9 Mar 2023 14:29:16 +0100 Subject: [PATCH 07/12] artifact signing CI support --- .../multiplatform/charts/extensions/PublishingSetup.kt | 2 +- multiplatform-charts/build.gradle.kts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index 7350c62..1fe3577 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -37,7 +37,7 @@ fun Project.publishingSetup() { } else { project.extra["signing.keyId"] = System.getenv("SIGNING_KEY_ID") project.extra["signing.password"] = System.getenv("SIGNING_PASSWORD") - project.extra["signing.secretKeyRingFile"] = System.getenv("SIGNING_SECRET_KEY_RING_FILE") + project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") project.extra["ossrhUsername"] = System.getenv("OSSRH_USERNAME") project.extra["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") } diff --git a/multiplatform-charts/build.gradle.kts b/multiplatform-charts/build.gradle.kts index 969d2dd..f268c06 100644 --- a/multiplatform-charts/build.gradle.kts +++ b/multiplatform-charts/build.gradle.kts @@ -44,6 +44,14 @@ kotlin { } signing { + if (project.extra.has("signing.secretKey") && project.extra.has("signing.password")) { + useInMemoryPgpKeys( + project.extra["signing.keyId"] as String, + project.extra["signing.secretKey"] as String, + project.extra["signing.password"] as String + ) + } + sign(publishing.publications) } From 048eab1602837be206b83a7cc78e1362fb11ea64 Mon Sep 17 00:00:00 2001 From: mmalek Date: Wed, 22 Mar 2023 11:56:50 +0100 Subject: [PATCH 08/12] simplify properties reading --- .../charts/extensions/PublishingSetup.kt | 21 +++++++++---------- multiplatform-charts/build.gradle.kts | 6 +++--- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index 1fe3577..7eaa3f3 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -28,18 +28,17 @@ fun Project.publishingSetup() { load(it) } }.let { properties -> - project.extra["signing.keyId"] = properties.getProperty("signing.keyId") - project.extra["signing.password"] = properties.getProperty("signing.password") - project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") - project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") - project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") + project.extra["signing.keyId"] = properties.getProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID") + project.extra["signing.password"] = properties.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD") + project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") + project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") + + if (properties.getProperty("signing.secretKeyRingFile") != null) { + project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") + } else { + project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") + } } - } else { - project.extra["signing.keyId"] = System.getenv("SIGNING_KEY_ID") - project.extra["signing.password"] = System.getenv("SIGNING_PASSWORD") - project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") - project.extra["ossrhUsername"] = System.getenv("OSSRH_USERNAME") - project.extra["ossrhPassword"] = System.getenv("OSSRH_PASSWORD") } publishing { diff --git a/multiplatform-charts/build.gradle.kts b/multiplatform-charts/build.gradle.kts index f268c06..07e9b23 100644 --- a/multiplatform-charts/build.gradle.kts +++ b/multiplatform-charts/build.gradle.kts @@ -46,9 +46,9 @@ kotlin { signing { if (project.extra.has("signing.secretKey") && project.extra.has("signing.password")) { useInMemoryPgpKeys( - project.extra["signing.keyId"] as String, - project.extra["signing.secretKey"] as String, - project.extra["signing.password"] as String + project.extra["signing.keyId"] as String?, + project.extra["signing.secretKey"] as String?, + project.extra["signing.password"] as String? ) } From 526975f49bac55a9c96ea606a420b8e8c8894026 Mon Sep 17 00:00:00 2001 From: mmalek Date: Wed, 22 Mar 2023 12:06:31 +0100 Subject: [PATCH 09/12] skip file check --- .../charts/extensions/PublishingSetup.kt | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index 7eaa3f3..153d16f 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -22,24 +22,21 @@ fun Project.publishingSetup() { project.version = version val secretPropsFile = project.rootProject.file("local.properties") - if (secretPropsFile.exists()) { - secretPropsFile.reader().use { - Properties().apply { - load(it) - } - }.let { properties -> - project.extra["signing.keyId"] = properties.getProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID") - project.extra["signing.password"] = properties.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD") - project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") - project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") - - if (properties.getProperty("signing.secretKeyRingFile") != null) { - project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") - } else { - project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") - } + val properties = secretPropsFile.reader().use { + Properties().apply { + load(it) } } + project.extra["signing.keyId"] = properties.getProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID") + project.extra["signing.password"] = properties.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD") + project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") + project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") + + if (properties.getProperty("signing.secretKeyRingFile") != null) { + project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") + } else { + project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") + } publishing { repositories { From 9afec119d66d5f3e2071ac93c2e38fc1abfdd08a Mon Sep 17 00:00:00 2001 From: mmalek Date: Wed, 22 Mar 2023 12:25:55 +0100 Subject: [PATCH 10/12] fix missing local.properties --- .../charts/extensions/PublishingSetup.kt | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index 153d16f..e86d933 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -21,21 +21,22 @@ fun Project.publishingSetup() { project.group = libs.versions.project.group.get() project.version = version + var properties: Properties? = null val secretPropsFile = project.rootProject.file("local.properties") - val properties = secretPropsFile.reader().use { - Properties().apply { - load(it) + if (secretPropsFile.exists()) { + secretPropsFile.reader().use { + properties = Properties().apply { load(it) } } } - project.extra["signing.keyId"] = properties.getProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID") - project.extra["signing.password"] = properties.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD") - project.extra["ossrhUsername"] = properties.getProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") - project.extra["ossrhPassword"] = properties.getProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") - if (properties.getProperty("signing.secretKeyRingFile") != null) { - project.extra["signing.secretKeyRingFile"] = properties.getProperty("signing.secretKeyRingFile") + project.extra["signing.keyId"] = properties?.getProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID") + project.extra["signing.password"] = properties?.getProperty("signing.password") ?: System.getenv("SIGNING_PASSWORD") + project.extra["ossrhUsername"] = properties?.getProperty("ossrhUsername") ?: System.getenv("OSSRH_USERNAME") + project.extra["ossrhPassword"] = properties?.getProperty("ossrhPassword") ?: System.getenv("OSSRH_PASSWORD") + if (properties?.getProperty("signing.secretKeyRingFile") != null) { + project.extra["signing.secretKeyRingFile"] = properties?.getProperty("signing.secretKeyRingFile") } else { - project.extra["signing.secretKey"] = System.getenv("SIGNING_SECRET_KEY") + project.extra["signing.secretKey"] = properties?.getProperty("signing.secretKey") ?: System.getenv("SIGNING_SECRET_KEY") } publishing { From 6d098e364dda5b5972486cb80b56f070bf35956e Mon Sep 17 00:00:00 2001 From: mmalek Date: Mon, 27 Mar 2023 16:24:52 +0200 Subject: [PATCH 11/12] add dokka files --- .../multiplatform/charts/extensions/PublishingSetup.kt | 7 +++++++ gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index e86d933..db4c905 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -3,6 +3,7 @@ package com.netguru.multiplatform.charts.extensions import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.api.Project import org.gradle.api.publish.maven.MavenPublication +import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.the import java.util.* @@ -39,6 +40,11 @@ fun Project.publishingSetup() { project.extra["signing.secretKey"] = properties?.getProperty("signing.secretKey") ?: System.getenv("SIGNING_SECRET_KEY") } + val javadocJar = tasks.register("javadocJar", Jar::class.java) { + archiveClassifier.set("javadoc") + from(tasks.named("dokkaHtml")) + } + publishing { repositories { maven { @@ -52,6 +58,7 @@ fun Project.publishingSetup() { } publications.withType(MavenPublication::class.java) { + artifact(javadocJar) pom { name.set(libs.versions.project.name.get()) description.set(libs.versions.project.description.get()) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d36936..4ccb5da 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,7 @@ shot = "5.14.1" ktlint = "10.2.1" # Project -project-group = "com.netguru" +project-group = "com.netguru.multiplatform-charts" project-artifact = "multiplatform-charts" project-version = "1.0.0" project-name = "Compose Multiplatform Charts" From 418f12bc5c0ee91f65ee70bc69c31bd343c9e3bb Mon Sep 17 00:00:00 2001 From: mmalek Date: Mon, 27 Mar 2023 18:13:18 +0200 Subject: [PATCH 12/12] Add developer info --- .../multiplatform/charts/extensions/PublishingSetup.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt index db4c905..a16c7b9 100644 --- a/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt +++ b/buildSrc/src/main/java/com/netguru/multiplatform/charts/extensions/PublishingSetup.kt @@ -70,6 +70,14 @@ fun Project.publishingSetup() { url.set("https://opensource.org/licenses/MIT") } } + developers { + developer { + name.set("Netguru Mobile") + email.set("mobile@netguru.com") + organization.set("Netguru") + organizationUrl.set("https://www.netguru.com/") + } + } scm { url.set(libs.versions.project.url.get()) }