Migrate to Hubdle

JavierSegoviaCordoba · Jul 18, 2022 · 1069dff · 1069dff
1 parent 5a8c259
commit 1069dff
Show file tree

Hide file tree

Showing 56 changed files with 370 additions and 291 deletions.
diff --git a/.github/PUBLISHING.md b/.github/PUBLISHING.md
@@ -1,4 +1,4 @@
 # Publishing
 
-Check [publishing](https://github.com/JavierSegoviaCordoba/gradle-plugins/blob/main/.github/PUBLISHING.md)
-from [JavierSC Gradle plugins](https://github.com/JavierSegoviaCordoba/gradle-plugins/)
+Check [publishing](https://github.com/JavierSegoviaCordoba/hubdle/blob/main/.github/PUBLISHING.md)
+from [JavierSC Hubdle](https://github.com/JavierSegoviaCordoba/hubdle/)
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -6,6 +6,9 @@
   "commitBodyTable": true,
   "gitIgnoredAuthors": [
     "[email protected]",
-    "[email protected]"
+    "[email protected]",
+    "[email protected]",
+    "29139614+renovate[bot]@users.noreply.github.com",
+    "[email protected]"
   ]
 }
diff --git a/.github/workflows/build-changelog-renovate-bot.yaml b/.github/workflows/build-changelog-renovate-bot.yaml
@@ -7,6 +7,5 @@ on:
 
 jobs:
   add-updated-dependencies-to-changelog:
-    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-changelog-renovate-bot.yaml@main
-    secrets:
-      TOKEN_GITHUB_ACTION: '${{ secrets.TOKEN_GITHUB_ACTION }}'
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-changelog-renovate-bot.yaml@hubdle
+    secrets: inherit
diff --git a/.github/workflows/build-kotlin-dispatcher.yaml b/.github/workflows/build-kotlin-dispatcher.yaml
@@ -15,13 +15,9 @@ on:
 
 jobs:
   build:
-    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-kotlin.yaml@main
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-kotlin.yaml@hubdle
     with:
       gradle-args: '${{ github.event.inputs.gradle-args }}'
       allow-github-actor-bots: false
       publish-all-docs: '${{ github.event.inputs.publish-all-docs }}'
-    secrets:
-      OSS_USER: '${{ secrets.OSS_USER }}'
-      OSS_TOKEN: '${{ secrets.OSS_TOKEN }}'
-      OSS_STAGING_PROFILE_ID: '${{ secrets.OSS_STAGING_PROFILE_ID }}'
-      SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
+    secrets: inherit
diff --git a/.github/workflows/build-kotlin.yaml b/.github/workflows/build-kotlin.yaml
@@ -15,11 +15,7 @@ on:
 
 jobs:
   build:
-    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-kotlin.yaml@main
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/build-kotlin.yaml@hubdle
     with:
       allow-github-actor-bots: false
-    secrets:
-      OSS_USER: '${{ secrets.OSS_USER }}'
-      OSS_TOKEN: '${{ secrets.OSS_TOKEN }}'
-      OSS_STAGING_PROFILE_ID: '${{ secrets.OSS_STAGING_PROFILE_ID }}'
-      SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
+    secrets: inherit
diff --git a/.github/workflows/generate-version-tag.yaml b/.github/workflows/generate-version-tag.yaml
@@ -28,9 +28,8 @@ on:
 
 jobs:
   generate:
-    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/generate-version-tag.yaml@main
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/generate-version-tag.yaml@hubdle
     with:
       stage: '${{ github.event.inputs.stage }}'
       scope: '${{ github.event.inputs.scope }}'
-    secrets:
-      TOKEN_GITHUB_ACTION: '${{ secrets.TOKEN_GITHUB_ACTION }}'
+    secrets: inherit
diff --git a/.github/workflows/publish-kotlin.yaml b/.github/workflows/publish-kotlin.yaml
@@ -7,15 +7,5 @@ on:
 
 jobs:
   publish:
-    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/publish-kotlin.yaml@main
-    secrets:
-      OSS_USER: '${{ secrets.OSS_USER }}'
-      OSS_TOKEN: '${{ secrets.OSS_TOKEN }}'
-      OSS_STAGING_PROFILE_ID: '${{ secrets.OSS_STAGING_PROFILE_ID }}'
-      SIGNING_KEY_NAME: '${{ secrets.SIGNING_KEY_NAME }}'
-      SIGNING_KEY_ID: '${{ secrets.SIGNING_KEY_ID }}'
-      SIGNING_KEY_PASSPHRASE: '${{ secrets.SIGNING_KEY_PASSPHRASE }}'
-      SIGNING_KEY: '${{ secrets.SIGNING_KEY }}'
-      GRADLE_PUBLISH_KEY: '${{ secrets.GRADLE_PUBLISH_KEY }}'
-      GRADLE_PUBLISH_SECRET: '${{ secrets.GRADLE_PUBLISH_SECRET }}'
-      SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/publish-kotlin.yaml@hubdle
+    secrets: inherit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Changed
 
+- artifact to `com.javiersc.mokoki:mokoki`
+
 ### Deprecated
 
 ### Removed
@@ -14,12 +16,10 @@
 
 ### Updated
 
-- `org.jetbrains.kotlinx:binary-compatibility-validator -> 0.10.0`
-- `io.kotest:kotest-assertions-core -> 5.3.0`
+- `com.android.tools.build:gradle -> 7.2.1`
+- `org.jetbrains.kotlin:kotlin-serialization -> 1.7.10`
+- `org.jetbrains.kotlin:kotlin-gradle-plugin -> 1.7.10`
 - `gradle -> 7.4.1`
-- `com.javiersc.gradle-plugins:all-plugins -> 0.1.0-rc.40`
-- `androidx.appcompat:appcompat -> 1.4.1`
-- `org.jetbrains.kotlinx:kotlinx-serialization-json -> 1.3.2`
 
 ## [0.1.0-alpha.9] - 2021-12-14
 
@@ -90,7 +90,7 @@
 
 ### Changed
 
-- Rename `mokoki` subproject to `mokoki-core`
+- Rename `mokoki` subproject to `mokoki`
 
 ## [0.1.0-alpha.1] - 2021-03-22
 

diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
-![Kotlin version](https://img.shields.io/badge/kotlin-1.6.10-blueviolet?logo=kotlin&logoColor=white)
-[![MavenCentral](https://img.shields.io/maven-central/v/com.javiersc.mokoki/mokoki-core?label=MavenCentral)](https://repo1.maven.org/maven2/com/javiersc/mokoki/mokoki-core/)
-[![Snapshot](https://img.shields.io/nexus/s/com.javiersc.mokoki/mokoki-core?server=https%3A%2F%2Foss.sonatype.org%2F&label=Snapshot)](https://oss.sonatype.org/content/repositories/snapshots/com/javiersc/mokoki/mokoki-core/)
+![Kotlin version](https://img.shields.io/badge/kotlin-1.7.0-blueviolet?logo=kotlin&logoColor=white)
+[![MavenCentral](https://img.shields.io/maven-central/v/com.javiersc.mokoki/mokoki?label=MavenCentral)](https://repo1.maven.org/maven2/com/javiersc/mokoki/mokoki/)
+[![Snapshot](https://img.shields.io/nexus/s/com.javiersc.mokoki/mokoki?server=https%3A%2F%2Foss.sonatype.org%2F&label=Snapshot)](https://oss.sonatype.org/content/repositories/snapshots/com/javiersc/mokoki/mokoki/)
 
 [![Build](https://img.shields.io/github/workflow/status/JavierSegoviaCordoba/mokoki/build-kotlin?label=Build&logo=GitHub)](https://github.com/JavierSegoviaCordoba/mokoki/tree/main)
-[![Quality](https://img.shields.io/sonar/quality_gate/JavierSegoviaCordoba_mokoki?label=Quality&logo=SonarCloud&logoColor=white&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=JavierSegoviaCordoba_mokoki)
-[![Tech debt](https://img.shields.io/sonar/tech_debt/JavierSegoviaCordoba_mokoki?label=Tech%20debt&logo=SonarCloud&logoColor=white&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=JavierSegoviaCordoba_mokoki)
+[![Coverage](https://img.shields.io/sonar/coverage/com.javiersc.mokoki:mokoki?label=Coverage&logo=SonarCloud&logoColor=white&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=com.javiersc.mokoki:mokoki)
+[![Quality](https://img.shields.io/sonar/quality_gate/com.javiersc.mokoki:mokoki?label=Quality&logo=SonarCloud&logoColor=white&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=com.javiersc.mokoki:mokoki)
+[![Tech debt](https://img.shields.io/sonar/tech_debt/com.javiersc.mokoki:mokoki?label=Tech%20debt&logo=SonarCloud&logoColor=white&server=https%3A%2F%2Fsonarcloud.io)](https://sonarcloud.io/dashboard?id=com.javiersc.mokoki:mokoki)
 
 # [Mokoki](https://mokoki.javiersc.com)
 
@@ -24,7 +25,7 @@ available at Maven Central.
 - Logger:
 
 ```kotlin
-implementation("com.javiersc.mokoki:mokoki-core:$version")
+implementation("com.javiersc.mokoki:mokoki:$version")
 ```
 
 - Serialization

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ hubdle {
     config {
         analysis()
         binaryCompatibilityValidator()
-        // coverage()
+        coverage()
         documentation {
             changelog()
             readme {

diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 ####################################################################################################
 ###                                      CONFIGURATION                                           ###
 ####################################################################################################
-root.project.name=mokoki
-main.project.name=mokoki-core
+root.project.name=mokoki-project
+main.project.name=mokoki
 project.group=com.javiersc.mokoki
 ####################################################################################################
 ###                                      CODE ANALYSIS                                           ###
@@ -29,16 +29,13 @@ pom.scm.developerConnection=scm:git:[email protected]:JavierSegoviaCordoba/mokoki.g
 ####################################################################################################
 android.useAndroidX=true
 kotlin.code.style=official
+kotlin.incremental.useClasspathSnapshot=true
 kotlin.js.compiler=both
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
 org.gradle.caching=true
 #org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
-org.gradle.vfs.watch=true
 #org.gradle.unsafe.configuration-cache=true
 #org.gradle.unsafe.configuration-cache-problems=warn
 #org.gradle.unsafe.configuration-cache.max-problems=100
 signing.gnupg.executable=gpg
-android.disableAutomaticComponentCreation=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-android = "7.2.0"
-hubdle = "0.2.0-alpha.21"
-kotlin = "1.6.10"
+android = "7.2.1"
+hubdle = "0.2.0-alpha.27"
+kotlin = "1.7.10"
 
 [libraries]
 android-toolsBuild-gradle = { module = "com.android.tools.build:gradle", version.ref = "android" }

diff --git a/mokoki-core/androidMain/AndroidManifest.xml b/mokoki-core/androidMain/AndroidManifest.xml
diff --git a/mokoki-core/iosMain/kotlin/com/javiersc/mokoki/IOSMokokiLogger.kt b/mokoki-core/iosMain/kotlin/com/javiersc/mokoki/IOSMokokiLogger.kt
diff --git a/mokoki-core/iosMain/kotlin/com/javiersc/mokoki/internal/LoggerNames.kt b/mokoki-core/iosMain/kotlin/com/javiersc/mokoki/internal/LoggerNames.kt
diff --git a/mokoki-serialization/androidMain/AndroidManifest.xml b/mokoki-serialization/androidMain/AndroidManifest.xml
diff --git a/mokoki-serialization/api/android/mokoki-serialization.api b/mokoki-serialization/api/android/mokoki-serialization.api
@@ -1,10 +1,3 @@
-public final class com/javiersc/mokoki/serialization/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public class com/javiersc/mokoki/serialization/PrintSerializableMokokiLogger : com/javiersc/mokoki/MokokiLogger {
 	public fun <init> ()V
 	public fun <init> (Lcom/javiersc/mokoki/Priority;)V

diff --git a/mokoki-serialization/build.gradle.kts b/mokoki-serialization/build.gradle.kts
@@ -6,7 +6,7 @@ hubdle {
     config {
         explicitApi()
         languageSettings {
-            optIn("kotlinx.serialization.ExperimentalSerializationApi")
+            experimentalSerializationApi()
         }
         publishing()
     }
@@ -19,7 +19,7 @@ hubdle {
             common {
                 main {
                     dependencies {
-                        api(projects.mokokiCore)
+                        api(projects.mokoki)
                     }
                 }
                 test {
@@ -30,11 +30,17 @@ hubdle {
             }
 
             android()
-            ios()
-            iosArm64()
-            iosSimulatorArm64()
-            iosX64()
+
+            darwin {
+                enableAll()
+            }
+
             jvm()
+            jvmAndAndroid()
+
+            mingw {
+                enableAll()
+            }
         }
     }
 }
diff --git a/...lization/PrintSerializableMokokiLogger.kt → ...lization/PrintSerializableMokokiLogger.kt b/...lization/PrintSerializableMokokiLogger.kt → ...lization/PrintSerializableMokokiLogger.kt
diff --git a/...tion/internal/BuildMokokiSerialization.kt → ...tion/internal/BuildMokokiSerialization.kt b/...tion/internal/BuildMokokiSerialization.kt → ...tion/internal/BuildMokokiSerialization.kt