Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android_kmp/KMP-Sample/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ androidx-espresso = "3.7.0"
androidx-lifecycle = "2.9.4"
androidx-testExt = "1.3.0"
composeMultiplatform = "1.9.0"
craftdCompose = "1.1.0"
craftdCompose = "1.1.1"
junit = "4.13.2"
kotlin = "2.2.21"
kotlinxCoroutinesCore = "1.10.2"
Expand Down
23 changes: 22 additions & 1 deletion android_kmp/app-sample-cmp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,36 @@ plugins {

android {
namespace = "com.codandotv.appsamplecmp"
compileSdk = 36

defaultConfig {
applicationId = "org.example.project"
minSdk = 24
targetSdk = 36
compileSdk = 36
versionCode = 1
versionName = "1.0"
}

signingConfigs {
create("release") {
storeFile = file("${System.getProperty("user.home")}/.android/debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
}
}

buildTypes {
getByName("debug") {
isMinifyEnabled = false
}
getByName("release") {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
signingConfig = signingConfigs.getByName("release")
}
}
}

kotlin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ android {

buildTypes {
getByName("release") {
isMinifyEnabled = true
proguardFiles("proguard-android.txt", "proguard-rules.pro")
consumerProguardFiles("proguard-rules.pro")
isMinifyEnabled = false
Comment thread
rviannaoliveira marked this conversation as resolved.
consumerProguardFiles("consumer-rules.pro")
}

getByName("debug") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,8 @@ android {

buildTypes {
getByName("release") {
isMinifyEnabled = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
consumerProguardFiles("proguard-rules.pro")
isMinifyEnabled = false
consumerProguardFiles("consumer-rules.pro")
}

getByName("debug") {
Expand Down
1 change: 1 addition & 0 deletions android_kmp/craftd-compose/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-keep class com.github.codandotv.craftd.compose.** { *; }
2 changes: 1 addition & 1 deletion android_kmp/craftd-compose/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
craftd.enableCompose=true
ARTIFACT_ID=craftd-compose
VERSION=1.1.0
VERSION=1.1.1
16 changes: 16 additions & 0 deletions android_kmp/craftd-core/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-keep class com.github.codandotv.craftd.** { *; }
-keepnames class com.github.codandotv.craftd.** { *; }

-keepattributes *Annotation*, InnerClasses
-dontnote kotlinx.serialization.AnnotationsKt
-keepclassmembers class kotlinx.serialization.json.** { *** Companion; }
-keepclasseswithmembers class * {
kotlinx.serialization.KSerializer serializer(...);
}
-keep,includedescriptorclasses class com.github.codandotv.craftd.**$$serializer { *; }
-keepclassmembers class com.github.codandotv.craftd.** {
*** Companion;
}
-keepclasseswithmembers class com.github.codandotv.craftd.** {
kotlinx.serialization.KSerializer serializer(...);
}
2 changes: 1 addition & 1 deletion android_kmp/craftd-core/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ARTIFACT_ID=craftd-core
VERSION=1.1.0
VERSION=1.1.1
1 change: 1 addition & 0 deletions android_kmp/craftd-xml/consumer-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-keep class com.github.codandotv.craftd.xml.** { *; }
2 changes: 1 addition & 1 deletion android_kmp/craftd-xml/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ARTIFACT_ID=craftd-xml
VERSION=1.1.0
VERSION=1.1.1
4 changes: 4 additions & 0 deletions android_kmp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[versions]
craftd = "1.1.1"
androidx-activity = "1.11.0"
androidx-lifecycle = "2.9.4"

Expand Down Expand Up @@ -40,6 +41,9 @@ plugin-maven = "0.28.0"
androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
craftd-core = { module = "io.github.codandotv:craftd-core", version.ref = "craftd" }
craftd-compose = { module = "io.github.codandotv:craftd-compose", version.ref = "craftd" }
craftd-xml = { module = "io.github.codandotv:craftd-xml", version.ref = "craftd" }
plugin_maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "plugin-maven" }
kotlin_gradle_plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
android_gradle_plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "android_gradle_plugin" }
Expand Down
Loading