From 094743fa3920c31fc5a69381fd4cf5bd9e8ac53c Mon Sep 17 00:00:00 2001 From: Younes Charfaoui Date: Thu, 16 May 2024 19:57:11 +0100 Subject: [PATCH 1/2] Fixing stability modifer with immutable --- .idea/kotlinc.xml | 2 +- tarka-ui-icons/build.gradle.kts | 4 ++-- .../src/main/java/com/tarkalabs/tarkaui/icons/TarkaIcon.kt | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 0fc31131..fe63bb67 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/tarka-ui-icons/build.gradle.kts b/tarka-ui-icons/build.gradle.kts index f05b202c..40b438ef 100644 --- a/tarka-ui-icons/build.gradle.kts +++ b/tarka-ui-icons/build.gradle.kts @@ -48,7 +48,7 @@ publishing { run { groupId = "com.tarkalabs" artifactId = "tarkaui-icons" - version = "1.0.3" + version = "1.0.4" artifact("$buildDir/outputs/aar/tarka-ui-icons-release.aar") } } @@ -70,7 +70,7 @@ dependencies { val composeUiVersion = "1.4.1" implementation("androidx.compose.runtime:runtime:$composeUiVersion") implementation("androidx.compose.ui:ui:$composeUiVersion") - api("com.microsoft.design:fluent-system-icons:1.1.201@aar") + api("com.microsoft.design:fluent-system-icons:1.1.239@aar") implementation("androidx.core:core-ktx:1.10.0") implementation("androidx.appcompat:appcompat:1.6.1") testImplementation("junit:junit:4.13.2") diff --git a/tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/TarkaIcon.kt b/tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/TarkaIcon.kt index 645e74ce..3a40301e 100644 --- a/tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/TarkaIcon.kt +++ b/tarka-ui-icons/src/main/java/com/tarkalabs/tarkaui/icons/TarkaIcon.kt @@ -1,8 +1,10 @@ package com.tarkalabs.tarkaui.icons import androidx.annotation.DrawableRes +import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color +@Immutable data class TarkaIcon internal constructor( @DrawableRes val iconRes: Int, val contentDescription: String, From 3656ec32b4388fc1cdc03df8ab767819469c5203 Mon Sep 17 00:00:00 2001 From: Younes Charfaoui Date: Thu, 16 May 2024 22:21:39 +0100 Subject: [PATCH 2/2] fixing the version again for tarka ui --- example/build.gradle.kts | 4 +++- tarka-ui-icons/build.gradle.kts | 5 ++--- tarka-ui/build.gradle.kts | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example/build.gradle.kts b/example/build.gradle.kts index caaff111..ca7c4cd7 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -49,7 +49,9 @@ android { dependencies { val composeUiVersion = "1.4.1" - implementation(project(":tarka-ui")) + implementation("com.tarkalabs:tarkaui:1.1.24") + implementation("com.tarkalabs:tarkaui-icons:1.0.5") + implementation("com.microsoft.design:fluent-system-icons:1.1.239@aar") implementation("androidx.core:core-ktx:1.10.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") implementation("androidx.activity:activity-compose:1.7.1") diff --git a/tarka-ui-icons/build.gradle.kts b/tarka-ui-icons/build.gradle.kts index 40b438ef..6c7ce00a 100644 --- a/tarka-ui-icons/build.gradle.kts +++ b/tarka-ui-icons/build.gradle.kts @@ -5,7 +5,6 @@ plugins { id("org.jetbrains.kotlin.android") id("maven-publish") id("org.jetbrains.dokka") - id("com.vanniktech.maven.publish") } android { @@ -44,11 +43,11 @@ android { publishing { publications { - create("gpr") { + register("gpr") { run { groupId = "com.tarkalabs" artifactId = "tarkaui-icons" - version = "1.0.4" + version = "1.0.5" artifact("$buildDir/outputs/aar/tarka-ui-icons-release.aar") } } diff --git a/tarka-ui/build.gradle.kts b/tarka-ui/build.gradle.kts index 7762197c..09bfc871 100644 --- a/tarka-ui/build.gradle.kts +++ b/tarka-ui/build.gradle.kts @@ -6,7 +6,6 @@ plugins { id("shot") id("maven-publish") id ("org.jetbrains.dokka") - id ("com.vanniktech.maven.publish") } android { @@ -66,7 +65,7 @@ publishing { run { groupId = "com.tarkalabs" artifactId = getLibraryArtifactId() - version = "1.1.21" + version = "1.1.24" artifact("$buildDir/outputs/aar/tarka-ui-release.aar") } } @@ -92,7 +91,7 @@ dependencies { implementation("androidx.compose.ui:ui-tooling-preview:$composeUiVersion") implementation("androidx.compose.material3:material3:1.2.0") implementation("androidx.compose.foundation:foundation:$composeUiVersion") - api(project(":tarka-ui-icons")) + api("com.tarkalabs:tarkaui-icons:1.0.5") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5")