Merge pull request #3 from teogor/fix/actions

Resolve Publishing to Maven Central and Documentation Deployment Issues

Author: teogor

.github/workflows/publish-docs.yml

@@ -19,9 +19,10 @@ concurrency:
   cancel-in-progress: false
 
 env:
-  DESTINATION_BRANCH: docs/${{ github.event.repository.owner.name }}/${{ github.event.repository.name }}/${{ github.sha }}
+  OWNER: teogor
+  DESTINATION_BRANCH: docs/teogor/${{ github.event.repository.name }}/${{ github.sha }}
   REPOSITORY: ${{ github.event.repository.name }}
-  REPO: ${{ github.event.repository.owner.name }}/${{ github.event.repository.name }}
+  REPO: teogor/${{ github.event.repository.name }}
   DISPLAY_NAME: Xenoglot
 
 jobs:

.github/workflows/publish-to-maven.yml

@@ -31,6 +31,6 @@ jobs:
       - name: Grant Permission to Execute Gradle
         run: chmod +x gradlew
 
-      - name: Publish to MavenCentral
+      - name: Publish to Maven Central
         run: |
-          ./gradlew :publish --no-configuration-cache
+          ./gradlew publish --no-configuration-cache

android/build.gradle.kts

@@ -17,7 +17,8 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
-  id("dev.teogor.winds")
+
+  alias(libs.plugins.winds)
 }
 
 kotlin {

bom/build.gradle.kts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 plugins {
-  id("dev.teogor.winds")
+  alias(libs.plugins.winds)
 }
 
 winds {

build.gradle.kts

@@ -3,13 +3,12 @@ import dev.teogor.winds.api.MavenPublish
 import dev.teogor.winds.api.getValue
 import dev.teogor.winds.api.model.Developer
 import dev.teogor.winds.api.model.LicenseType
-import dev.teogor.winds.api.model.Version
+import dev.teogor.winds.api.model.createVersion
 import dev.teogor.winds.api.provider.Scm
 import dev.teogor.winds.gradle.utils.afterWindsPluginConfiguration
 import dev.teogor.winds.gradle.utils.attachTo
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaPlugin
-import org.jetbrains.dokka.gradle.DokkaTask
 
 buildscript {
   repositories {
@@ -27,11 +26,12 @@ plugins {
   // Android Tools
   alias(libs.plugins.android.library) apply false
 
-  alias(libs.plugins.winds)
-  alias(libs.plugins.vanniktech.maven)
-  alias(libs.plugins.dokka)
-  alias(libs.plugins.spotless)
-  alias(libs.plugins.api.validator)
+  alias(libs.plugins.winds) apply true
+
+  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
 }
 
 winds {
@@ -52,12 +52,11 @@ winds {
 
     groupId = "dev.teogor.xenoglot"
     artifactIdElements = 1
+    url = "https://source.teogor.dev/xenoglot"
 
-    version = Version(
-      major = 1,
-      minor = 0,
-      patch = 0,
-    ).setAlphaRelease(1)
+    version = createVersion(1, 0, 0) {
+      alphaRelease(1)
+    }
 
     // TODO winds
     //  required by dokka

core/build.gradle.kts

@@ -17,7 +17,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   `kotlin-dsl`
-  id("dev.teogor.winds")
+
+  alias(libs.plugins.winds)
 }
 
 java {

gradle/libs.versions.toml

@@ -2,26 +2,26 @@
 apiValidator = "0.13.2"
 aboutLibraries = "10.8.3"
 accompanist = "0.33.2-alpha"
-androidDesugarJdkLibs = "2.0.3"
-androidGradlePlugin = "8.1.2"
-androidxActivity = "1.8.0"
+androidDesugarJdkLibs = "2.0.4"
+androidGradlePlugin = "8.1.1"
+androidxActivity = "1.8.1"
 androidxAppCompat = "1.6.1"
 androidxAnnotation = "1.7.0"
-androidxBrowser = "1.6.0"
+androidxBrowser = "1.7.0"
 androidxComposeBom = "2023.10.01"
 androidxComposeCompiler = "1.5.3"
-androidxComposeMaterial3 = "1.2.0-alpha10"
-androidxComposeRuntimeTracing = "1.0.0-alpha04"
+androidxComposeMaterial3 = "1.2.0-alpha11"
+androidxComposeRuntimeTracing = "1.0.0-alpha05"
 androidxConstraint = "1.1.0-alpha13"
 androidxCore = "1.12.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.0.0"
 androidxEspresso = "3.5.1"
-androidxHiltNavigationCompose = "1.0.0"
+androidxHiltNavigationCompose = "1.1.0"
 androidxLifecycle = "2.6.2"
-androidxMacroBenchmark = "1.2.0"
+androidxMacroBenchmark = "1.2.1"
 androidxMetrics = "1.0.0-alpha04"
-androidxNavigation = "2.7.4"
+androidxNavigation = "2.7.5"
 androidxProfileinstaller = "1.3.1"
 androidxStartup = "1.1.1"
 androidxTestCore = "1.5.0"
@@ -30,50 +30,50 @@ androidxTestRules = "1.5.0"
 androidxTestRunner = "1.5.3"
 androidxTracing = "1.1.0"
 androidxUiAutomator = "2.2.0"
-androidxWindowManager = "1.1.0"
+androidxWindowManager = "1.2.0"
 androidxWork = "2.8.1"
 buildConfig = "3.1.0"
-coil = "2.2.2"
+coil = "2.4.0"
 colorMath = "3.2.0"
 dokka = "1.9.0"
 espressoCore = "3.5.1"
-firebaseBom = "32.4.0"
+firebaseBom = "32.6.0"
 firebaseCrashlyticsPlugin = "2.9.9"
 firebasePerfPlugin = "1.4.2"
 googleMaterial = "1.10.0"
 gmsPlugin = "4.4.0"
 gson = "2.10.1"
 gradlePublish = "1.1.0"
-hilt = "2.47"
-hiltExt = "1.0.0"
+hilt = "2.48.1"
+hiltExt = "1.1.0"
 jacoco = "0.8.7"
 jsoup = "1.16.1"
 junit = "4.13.2"
 junit4 = "4.13.2"
-kotlin = "1.9.10"
-kotlinxCollections = "0.3.5"
+kotlin = "1.9.20"
+kotlinxCollections = "0.3.6"
 kotlinxCoroutines = "1.7.3"
 kotlinxDatetime = "0.4.1"
 kotlinxSerializationJson = "1.6.0"
 ksp = "1.9.10-1.0.13"
 landscapist = "2.2.3"
-lint = "31.1.2"
+lint = "31.1.4"
 lifecycleRuntimeKtx = "2.6.2"
-okhttp = "4.10.0"
-protobuf = "3.24.0"
+okhttp = "4.12.0"
+protobuf = "3.24.4"
 protobufPlugin = "0.9.4"
 retrofit = "2.9.0"
 retrofitKotlinxSerializationJson = "1.0.0"
 room = "2.6.0"
 spotless = "6.21.0"
 startup = "1.2.0-alpha02"
-turbine = "0.12.1"
+turbine = "1.0.0"
 vanniktechMavenPlugin = "0.25.3"
 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" }