From f33e362f6e3ae3b0cf9eb2aba17914d99b7d9fd7 Mon Sep 17 00:00:00 2001 From: Teodor Grigor Date: Wed, 22 Nov 2023 23:07:30 +0200 Subject: [PATCH] rev --- .idea/compiler.xml | 6 ++++++ backup/build.gradle.kts | 10 ++++------ bom/build.gradle.kts | 10 +++++----- build.gradle.kts | 14 ++++++++------ core/build.gradle.kts | 9 ++++----- data/build.gradle.kts | 9 ++++----- firebase/build.gradle.kts | 9 ++++----- framework/build.gradle.kts | 9 ++++----- gradle/libs.versions.toml | 2 +- monetisation/build.gradle.kts | 9 ++++----- navigation/build.gradle.kts | 9 ++++----- screen/build.gradle.kts | 9 ++++----- settings.gradle.kts | 1 + ui/build.gradle.kts | 9 ++++----- 14 files changed, 57 insertions(+), 58 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 81050c79..39041a7b 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -17,6 +17,12 @@ + + + + + + \ No newline at end of file diff --git a/backup/build.gradle.kts b/backup/build.gradle.kts index 88b0c24e..af19b0fe 100644 --- a/backup/build.gradle.kts +++ b/backup/build.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ -import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -27,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 4898b39f..7fabfc85 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -16,6 +16,8 @@ import dev.teogor.winds.api.model.Version * limitations under the License. */ +import dev.teogor.winds.api.model.createVersion + plugins { id("java-platform") alias(libs.plugins.winds) @@ -28,11 +30,9 @@ winds { artifactIdElements = 1 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } defineBoM() } diff --git a/build.gradle.kts b/build.gradle.kts index f52ac730..52ed1fc9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,11 +28,13 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.about.libraries) apply false - alias(libs.plugins.vanniktech.maven) - alias(libs.plugins.winds) - alias(libs.plugins.dokka) - alias(libs.plugins.spotless) - alias(libs.plugins.api.validator) + // alias(libs.plugins.winds) apply true + id("dev.teogor.winds") + + alias(libs.plugins.vanniktech.maven) apply true + alias(libs.plugins.dokka) apply true + alias(libs.plugins.spotless) apply true + alias(libs.plugins.api.validator) apply true id("dev.teogor.ceres.docs") } @@ -53,8 +55,8 @@ winds { description = "\uD83E\uDE90 Ceres is a comprehensive Android development framework designed to streamline your app development process. Powered by the latest technologies like Jetpack Compose, Hilt, Coroutines, and Flow, Ceres empowers developers to build modern and efficient Android applications." groupId = "dev.teogor.ceres" - artifactIdElements = 2 + url = "https://source.teogor.dev/ceres" inceptionYear = 2022 diff --git a/core/build.gradle.kts b/core/build.gradle.kts index f0668b55..5d548c77 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -15,6 +15,7 @@ */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -27,10 +28,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index a663fa46..4c92f1a4 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/firebase/build.gradle.kts b/firebase/build.gradle.kts index 68030613..faef0357 100644 --- a/firebase/build.gradle.kts +++ b/firebase/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/framework/build.gradle.kts b/framework/build.gradle.kts index 018b3daa..0028aec8 100644 --- a/framework/build.gradle.kts +++ b/framework/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 358ef344..6bdaf942 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,7 +72,7 @@ kotlin-poet = "1.14.2" kotlin-xml-builder = "1.9.1" kotlinx-serialization-core = "1.6.0" jdom2 = "2.0.6.1" -winds = "1.0.0-alpha02" +winds = "1.0.0-alpha03" [libraries] about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-core", version.ref = "aboutLibraries" } diff --git a/monetisation/build.gradle.kts b/monetisation/build.gradle.kts index d6913591..60d81481 100644 --- a/monetisation/build.gradle.kts +++ b/monetisation/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/navigation/build.gradle.kts b/navigation/build.gradle.kts index 7547efd8..06a9d021 100644 --- a/navigation/build.gradle.kts +++ b/navigation/build.gradle.kts @@ -17,6 +17,7 @@ import com.vanniktech.maven.publish.SonatypeHost import dev.teogor.ceres.gradle.plugins.CeresLibraryExtension import dev.teogor.ceres.gradle.plugins.setModuleCoordinates import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -29,10 +30,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/screen/build.gradle.kts b/screen/build.gradle.kts index ae1d461a..c33d4aef 100644 --- a/screen/build.gradle.kts +++ b/screen/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index e51aadba..7b8dda13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,6 @@ pluginManagement { includeBuild("plugin/") + includeBuild("E:\\Teogor\\dev\\.github\\winds") repositories { google() mavenCentral() diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index d3e1dc1e..578989a1 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import dev.teogor.winds.api.model.Version +import dev.teogor.winds.api.model.createVersion plugins { alias(libs.plugins.winds) @@ -26,10 +27,8 @@ winds { artifactIdElements = 2 - version = Version( - major = 1, - minor = 0, - patch = 0, - ).setAlphaRelease(1) + version = createVersion(1, 0, 0) { + alphaRelease(1) + } } }