@momo-kits/native-kits 0.156.1-test.10-debug → 0.156.1-test.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.156.1-test.10-debug",
+  "version": "0.156.1-test.11",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish.sh

@@ -213,13 +213,9 @@ phase_publish_npm() {
     
     ./gradlew clean
     
-    # First publish: normal version (compose/ is excluded via .npmignore)
-    echo "📤 Publishing normal version (without compose)..."
-    npm publish --tag $NPM_TAG --access=public
-    
-    echo "✅ Normal version published successfully!"
-    
-    # Second publish: debug version with compose kits included
+    # ============================================================
+    # FIRST PUBLISH: DEBUG VERSION (with compose kits included)
+    # ============================================================
     echo ""
     echo "🔧 Preparing debug version with compose kits..."
     
@@ -302,6 +298,8 @@ EOF
     echo "📤 Publishing debug version (with compose)..."
     npm publish --tag $NPM_TAG --access=public
     
+    echo "✅ Debug version published successfully!"
+    
     # Restore .npmignore
     mv .npmignore.backup .npmignore
     echo "✅ .npmignore restored"
@@ -321,10 +319,19 @@ EOF
     
     echo "✅ package.json version restored"
     
+    # ============================================================
+    # SECOND PUBLISH: NORMAL VERSION (without compose)
+    # ============================================================
+    echo ""
+    echo "📤 Publishing normal version (without compose)..."
+    npm publish --tag $NPM_TAG --access=public
+    
+    echo "✅ Normal version published successfully!"
+    
     echo ""
     echo "✅ PHASE 2 COMPLETED"
-    echo "   📦 Normal version: $VERSION (without compose)"
-    echo "   🐛 Debug version: $DEBUG_VERSION (with compose)"
+    echo "   🐛 Debug version: $DEBUG_VERSION (with compose) - Published first"
+    echo "   📦 Normal version: $VERSION (without compose) - Published second"
     echo "   🏷️  NPM Tag: $NPM_TAG"
     echo ""
 }

package/build.gradle.kts

@@ -1,11 +0,0 @@
-plugins {
-    // this is necessary to avoid the plugins to be loaded multiple times
-    // in each subproject's classloader
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.compose) apply false
-    alias(libs.plugins.kotlin.compose.compiler) apply false
-    alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
-    alias(libs.plugins.jetbrains.kotlin.serialization) apply false
-    alias(libs.plugins.vanniktech.mavenPublish) apply false
-}

package/compose/build.gradle.kts

@@ -1,180 +0,0 @@
-// import com.vanniktech.maven.publish.JavadocJar
-// import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-//         alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String? = findProperty("name") as String? ?: ""
-val gitlabRepo: String? = findProperty("repo") as String? ?: ""
-val gitlabUrl: String? = findProperty("url") as String? ?: ""
-val gitlabGroup: String? = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String? = findProperty("version") as String? ?: ""
-val gitlabUser: String? = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String? = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = "0.156.1-test.10-debug"
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "vn.momo.kits.kits"
-    compileSdk = 35
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = 24
-    }
-}
-
-dependencies {
-}
-
-repositories {
-    google {
-        mavenContent {
-            includeGroupAndSubgroups("androidx")
-            includeGroupAndSubgroups("com.android")
-            includeGroupAndSubgroups("com.google")
-        }
-    }
-    mavenCentral()
-    maven {
-        url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
-    }
-    maven {
-        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
-        isAllowInsecureProtocol = true
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-// publishing {
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials {
-//                 username = gitlabUser
-//                 password = gitlabKey
-//             }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// }
-
-// mavenPublishing {
-//     configure(
-//         KotlinMultiplatform(
-//             javadocJar = JavadocJar.Empty(),
-//             sourcesJar = true,
-//             androidVariantsToPublish = listOf("release")
-//         )
-//     )
-// 
-//     repositories {
-//         maven {
-//             name = "${gitlabRepo}Packages"
-//             credentials { username = gitlabUser; password = gitlabKey }
-//             url = uri("$gitlabUrl")
-//         }
-//     }
-// 
-//     coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-// 
-//     pom {
-//         name = "$gitlabName Klib"
-//         description = "$gitlabName"
-//         url = "https://gitlab.mservice.com.vn"
-//         licenses {
-//             license {
-//                 name = "The Apache License, Version 2.0"
-//                 url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//                 distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-//             }
-//         }
-//         developers {
-//             developer {
-//                 id = "kotlin-hands-on"
-//                 name = "Kotlin Developer Advocate"
-//                 url = "https://github.com/kotlin-hands-on/"
-//             }
-//         }
-//     }
-// }
-

package/compose/build.gradle.kts.backup

@@ -1,180 +0,0 @@
-import com.vanniktech.maven.publish.JavadocJar
-import com.vanniktech.maven.publish.KotlinMultiplatform
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-plugins {
-    alias(libs.plugins.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.compose.compiler)
-    alias(libs.plugins.vanniktech.mavenPublish)
-    id(libs.plugins.jetbrains.kotlin.cocoapods.get().pluginId)
-    kotlin("plugin.serialization")
-}
-
-val gitlabName: String? = findProperty("name") as String? ?: ""
-val gitlabRepo: String? = findProperty("repo") as String? ?: ""
-val gitlabUrl: String? = findProperty("url") as String? ?: ""
-val gitlabGroup: String? = findProperty("group") as String? ?: ""
-val gitlabArtifactId: String = findProperty("artifact.id") as String? ?: ""
-val gitlabVersion: String? = findProperty("version") as String? ?: ""
-val gitlabUser: String? = findProperty("gitlab.user") as String? ?: ""
-val gitlabKey: String? = findProperty("gitlab.password") as String? ?: ""
-
-kotlin {
-    androidTarget {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-        publishLibraryVariants("release")
-    }
-
-    val fwName = gitlabArtifactId
-    val iosTargets = listOf(iosX64(), iosArm64(), iosSimulatorArm64())
-    iosTargets.forEach {
-        it.binaries.framework {
-            baseName = fwName
-            binaryOption("bundleId", "$gitlabGroup.$fwName")
-            isStatic = true
-        }
-    }
-
-    cocoapods {
-        version = gitlabVersion
-        summary = "IOS Shared module"
-        homepage = "https://momo.vn"
-        ios.deploymentTarget = "15.0"
-
-        framework {
-            baseName = fwName
-            isStatic = true
-        }
-
-        pod("lottie-ios") {
-            moduleName = "Lottie"
-            version = "4.4.3"
-            extraOpts += listOf("-compiler-option", "-fmodules")
-        }
-    }
-
-    sourceSets {
-        commonMain.dependencies {
-            implementation(compose.runtime)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.components.resources)
-            implementation(libs.ktor.client.core)
-            implementation(libs.jetbrains.coroutines.core)
-            implementation(libs.navigation.multiplatform)
-            implementation(libs.coil.multiplatform.compose)
-            implementation(libs.coil.multiplatform.core)
-            implementation(libs.coil.multiplatform.network.ktor)
-            implementation(libs.jetbrains.serialization.json)
-            implementation(libs.kotlinx.datetime)
-            api(libs.native.max.api)
-        }
-        androidMain.dependencies {
-            implementation(libs.ktor.client.okhttp)
-            implementation(libs.airbnb.lottie)
-        }
-        iosMain.dependencies {
-            implementation(libs.ktor.client.darwin)
-        }
-    }
-}
-
-android {
-    namespace = "$gitlabGroup.$gitlabArtifactId"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    defaultConfig {
-        minSdk = libs.versions.android.minSdk.get().toInt()
-    }
-}
-
-dependencies {
-}
-
-repositories {
-    google {
-        mavenContent {
-            includeGroupAndSubgroups("androidx")
-            includeGroupAndSubgroups("com.android")
-            includeGroupAndSubgroups("com.google")
-        }
-    }
-    mavenCentral()
-    maven {
-        url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
-        credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
-    }
-    maven {
-        url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
-        isAllowInsecureProtocol = true
-    }
-}
-
-compose {
-    resources {
-        publicResClass = true
-        packageOfResClass = "vn.momo.uikits.resources"
-        generateResClass = always
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials {
-                username = gitlabUser
-                password = gitlabKey
-            }
-            url = uri("$gitlabUrl")
-        }
-    }
-}
-
-mavenPublishing {
-    configure(
-        KotlinMultiplatform(
-            javadocJar = JavadocJar.Empty(),
-            sourcesJar = true,
-            androidVariantsToPublish = listOf("release")
-        )
-    )
-
-    repositories {
-        maven {
-            name = "${gitlabRepo}Packages"
-            credentials { username = gitlabUser; password = gitlabKey }
-            url = uri("$gitlabUrl")
-        }
-    }
-
-    coordinates(gitlabGroup.toString(), gitlabArtifactId, gitlabVersion.toString())
-
-    pom {
-        name = "$gitlabName Klib"
-        description = "$gitlabName"
-        url = "https://gitlab.mservice.com.vn"
-        licenses {
-            license {
-                name = "The Apache License, Version 2.0"
-                url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution = "https://www.apache.org/licenses/LICENSE-2.0.txt"
-            }
-        }
-        developers {
-            developer {
-                id = "kotlin-hands-on"
-                name = "Kotlin Developer Advocate"
-                url = "https://github.com/kotlin-hands-on/"
-            }
-        }
-    }
-}
-

package/compose/compose.podspec

@@ -1,54 +0,0 @@
-Pod::Spec.new do |spec|
-    spec.name                     = 'compose'
-    spec.version                  = '0.156.1-beta.2'
-    spec.homepage                 = 'https://momo.vn'
-    spec.source                   = { :http=> ''}
-    spec.authors                  = ''
-    spec.license                  = ''
-    spec.summary                  = 'IOS Shared module'
-    spec.vendored_frameworks      = 'build/cocoapods/framework/kits.framework'
-    spec.libraries                = 'c++'
-    spec.ios.deployment_target    = '15.0'
-    spec.dependency 'lottie-ios', '4.4.3'
-                
-    if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
-        raise "
-
-        Kotlin framework 'kits' doesn't exist yet, so a proper Xcode project can't be generated.
-        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
-
-            ./gradlew :compose:generateDummyFramework
-
-        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
-    end
-                
-    spec.xcconfig = {
-        'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
-    }
-                
-    spec.pod_target_xcconfig = {
-        'KOTLIN_PROJECT_PATH' => ':compose',
-        'PRODUCT_MODULE_NAME' => 'kits',
-    }
-                
-    spec.script_phases = [
-        {
-            :name => 'Build compose',
-            :execution_position => :before_compile,
-            :shell_path => '/bin/sh',
-            :script => <<-SCRIPT
-                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
-                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
-                  exit 0
-                fi
-                set -ev
-                REPO_ROOT="$PODS_TARGET_SRCROOT"
-                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
-                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
-                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
-                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
-            SCRIPT
-        }
-    ]
-    spec.resources = ['build/compose/cocoapods/compose-resources']
-end

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -1,113 +0,0 @@
-package vn.momo.kits.platform
-
-import android.annotation.SuppressLint
-import android.content.res.Resources
-import android.graphics.BlurMaskFilter
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
-import android.os.Build
-import androidx.compose.foundation.layout.Box
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.NativePaint
-import androidx.compose.ui.graphics.Paint
-import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.airbnb.lottie.LottieProperty
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.LottieConstants
-import com.airbnb.lottie.compose.rememberLottieComposition
-import com.airbnb.lottie.compose.rememberLottieDynamicProperties
-import com.airbnb.lottie.compose.rememberLottieDynamicProperty
-import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.AppStatusBar
-import vn.momo.kits.utils.readJson
-import androidx.activity.compose.BackHandler as AndroidBackHandler
-
-actual fun getPlatformName(): String = "Android"
-
-@Composable
-actual fun getScreenDimensions(): ScreenDimension {
-    val config = LocalConfiguration.current
-    return ScreenDimension(
-        config.screenWidthDp, config.screenHeightDp
-    )
-}
-
-actual fun NativePaint.setMaskFilter(blurRadius: Float) {
-    this.maskFilter = BlurMaskFilter(blurRadius, BlurMaskFilter.Blur.NORMAL)
-}
-
-@SuppressLint("InternalInsetResource")
-@Composable
-actual fun getStatusBarHeight(): Dp {
-    val resourceId = Resources.getSystem().getIdentifier(
-        "status_bar_height",
-        "dimen",
-        "android"
-    )
-    return if(resourceId > 0) Resources.getSystem().getDimensionPixelSize(resourceId).dp else 0.dp
-}
-
-@Composable
-actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
-    AndroidBackHandler(enabled = enabled, onBack = onBack)
-}
-
-@Composable
-actual fun getScreenHeight(): Dp {
-    return getScreenDimensions().height.dp + if (getAndroidBuildVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
-}
-
-actual fun getAndroidBuildVersion(): Int = Build.VERSION.SDK_INT
-
-@Composable
-actual fun LottieAnimation(
-    path: String,
-    tintColor: Color?,
-    bgColor: Color?,
-    modifier: Modifier
-) {
-    val json = readJson(path)
-
-    if (json.isEmpty()) {
-        Box(modifier)
-        return
-    }
-
-    val composition by rememberLottieComposition(
-        LottieCompositionSpec.JsonString(json)
-    )
-
-    val colorFilter = PorterDuffColorFilter(
-        tintColor?.toArgb() ?: Color.White.toArgb(),
-        PorterDuff.Mode.SRC_ATOP
-    )
-
-    val dynamicProperties = rememberLottieDynamicProperties(
-        rememberLottieDynamicProperty(
-            property = LottieProperty.COLOR_FILTER,
-            value = colorFilter,
-            keyPath = arrayOf("**")
-        )
-    )
-
-    LottieAnimation(
-        composition = composition,
-        iterations = LottieConstants.IterateForever,
-        dynamicProperties = if (tintColor != null) dynamicProperties else null,
-        modifier = modifier
-    )
-}
-
-actual fun NativePaint.setColor(color: Color){
-    this.color = color.toArgb()
-}
-