Merge branch 'develop' of https://github.com/VictorKabata/DarajaMulti…

…platform into develop
VictorKabata · Aug 16, 2024 · 3c24836 · 3c24836
2 parents 2d48145 + 30b2750
commit 3c24836
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 31 deletions.
diff --git a/.github/workflows/publish_android.yml → .github/workflows/publish_kmp_lib.yml b/.github/workflows/publish_android.yml → .github/workflows/publish_kmp_lib.yml
@@ -1,9 +1,9 @@
-name: Sign and Publish Android Library
+name: Sign and Publish KMP Library
 
 on:
   workflow_dispatch:
     inputs:
-      androidVersionName:
+      versionName:
         description: 'Android Version Name (eg. 0.9.0)'
         required: true
 
@@ -36,7 +36,7 @@ jobs:
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          POM_VERSION: ${{ github.event.inputs.androidVersionName }}
+          POM_VERSION: ${{ github.event.inputs.versionName }}
           POM_NAME: ${{ secrets.POM_NAME }}
           POM_DESCRIPTION: ${{ secrets.POM_DESCRIPTION }}
           POM_GROUPID: ${{ secrets.POM_GROUPID }}

diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts
@@ -43,11 +43,11 @@ kotlin {
     kotlin.applyDefaultHierarchyTemplate()
 
     androidTarget {
+        publishLibraryVariants("release")
+
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_1_8)
         }
-
-        publishLibraryVariants("release")
     }
 
     iosX64()
@@ -102,22 +102,13 @@ android {
         minSdk = 21
         compileSdk = 34
     }
+
     namespace = "com.vickbt.darajamultiplatform"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-
-    buildTypes {
-        getByName("debug") {}
-
-        getByName("release") {
-            isMinifyEnabled = true
-        }
-    }
 }
 
 tasks.named<DependencyUpdatesTask>("dependencyUpdates").configure {
@@ -167,13 +158,8 @@ publishing {
 
     repositories {
         maven {
-            name = "Sonatype"
-            url =
-                if (version.toString().endsWith("SNAPSHOT")) {
-                    snapshotsRepoUrl
-                } else {
-                    releasesRepoUrl
-                }
+            name = "sonatype"
+            url = if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
 
             credentials {
                 username = project.get("OSSRH_USERNAME")
@@ -183,14 +169,13 @@ publishing {
     }
 
     publications.withType<MavenPublication> {
+        groupId = project.get("POM_GROUPID")
+        artifactId = project.get("POM_ARTIFACTID")
+        version = project.get("POM_VERSION")
 
-        artifact(javadocJar)
+        artifact(javadocJar.get())
 
         pom {
-            groupId = project.get("POM_GROUPID")
-            artifactId = project.get("POM_ARTIFACTID")
-            version = project.get("POM_VERSION")
-
             name.set(project.get("POM_NAME"))
             description.set(project.get("POM_DESCRIPTION"))
             url.set(project.get("POM_URL"))

diff --git a/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/AccountBalanceResponse.kt b/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/AccountBalanceResponse.kt
@@ -20,7 +20,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class AccountBalanceResponse(
+internal data class AccountBalanceResponse(
     @SerialName("OriginatorConversationID")
     val originatorConversationId: String,
     @SerialName("ConversationID")

diff --git a/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/C2BResponse.kt b/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/C2BResponse.kt
@@ -23,7 +23,7 @@ import kotlin.native.ObjCName
 @ObjCName(swiftName = "C2BResponse")
 @Serializable
 /***/
-data class C2BResponse(
+internal data class C2BResponse(
     /**This is a global unique identifier for the transaction request returned by the API proxy upon successful request submission.*/
     @SerialName("OriginatorCoversationID")
     val originatorCoversationId: String,

diff --git a/...ja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/DarajaTransactionResponse.kt b/...ja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/DarajaTransactionResponse.kt
@@ -22,7 +22,7 @@ import kotlin.native.ObjCName
 
 @ObjCName(swiftName = "DarajaTransactionResponse")
 @Serializable
-data class DarajaTransactionResponse(
+internal data class DarajaTransactionResponse(
     @SerialName("ResponseCode")
     val responseCode: String,
     @SerialName("ResponseDescription")

diff --git a/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/DynamicQrResponse.kt b/daraja/src/commonMain/kotlin/com/vickbt/darajakmp/network/models/DynamicQrResponse.kt
@@ -29,7 +29,7 @@ import kotlin.native.ObjCName
  * @param [responseDescription] This is a response describing the status of the transaction.
  * @param [qrCode] QR Code Image/Data/String.
  * */
-data class DynamicQrResponse(
+internal data class DynamicQrResponse(
     @SerialName("ResponseCode")
     val responseCode: String,
     @SerialName("RequestID")