Merge pull request #255 from tarkalabs/updating-project

Updating Projects Main Dependencies.
tarkalabs · Oct 24, 2024 · 53d3d19 · 53d3d19
2 parents 54aeb8c + 2b995b5
commit 53d3d19
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@ local.properties
 .idea/deploymentTargetDropDown.xml
 .idea/gradle.xml
 .idea/misc.xml
+
+# Kotlin 2.0
+.kotlin/
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,11 +5,12 @@ buildscript {
 }
 
 plugins {
-  id("com.android.application") version "7.4.2" apply false
-  id("com.android.library") version "7.4.2" apply false
-  id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+  id("com.android.application") version "8.7.1" apply false
+  id("com.android.library") version "8.7.1" apply false
+  id("org.jetbrains.kotlin.android") version "2.0.21" apply false
   id("com.vanniktech.maven.publish") version "0.27.0"
   id("org.jetbrains.dokka") version  "1.9.20" apply false
+  id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
 }
 
 subprojects {

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -2,6 +2,7 @@
 plugins {
   id ("com.android.application")
   id ("org.jetbrains.kotlin.android")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -34,12 +35,6 @@ android {
   kotlinOptions {
     jvmTarget = "17"
   }
-  buildFeatures {
-    compose =  true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.11"
-  }
   packagingOptions {
     resources {
       excludes.add("/META-INF/{AL2.0,LGPL2.1}")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 #Thu Apr 06 13:09:30 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
+import java.io.FileInputStream
+import java.util.Properties
 
 
 pluginManagement {
@@ -10,14 +12,21 @@ pluginManagement {
   }
 }
 dependencyResolutionManagement {
+  val localProperties = Properties()
+  val localPropertiesFile = File("local.properties")
+  if (localPropertiesFile.exists()) {
+    localProperties.load(FileInputStream(localPropertiesFile))
+  }
   repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
   repositories {
     google()
     mavenCentral()
     maven(url = "https://maven.pkg.github.com/tarkalabs/tarka-ui-kit-android") {
       credentials {
-        username = System.getenv("GITHUB_USER")
-        password = System.getenv("GITHUB_TOKEN")
+        username =
+          System.getenv("GITHUB_USER") ?: localProperties.getProperty("GITHUB_USER")
+        password =
+          System.getenv("GITHUB_TOKEN") ?: localProperties.getProperty("GITHUB_TOKEN")
       }
     }
   }

diff --git a/tarka-ui-icons/build.gradle.kts b/tarka-ui-icons/build.gradle.kts
@@ -1,10 +1,15 @@
 @file:Suppress("UnstableApiUsage")
 
+import java.io.FileInputStream
+import java.util.Properties
+
+
 plugins {
   id("com.android.library")
   id("org.jetbrains.kotlin.android")
   id("maven-publish")
   id("org.jetbrains.dokka")
+  id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -31,13 +36,6 @@ android {
   kotlinOptions {
     jvmTarget = "17"
   }
-
-  buildFeatures {
-    compose = true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.11"
-  }
 }
 
 
@@ -54,25 +52,32 @@ publishing {
   }
 
   repositories {
+    val localProperties = Properties()
+    val localPropertiesFile = File("local.properties")
+    if (localPropertiesFile.exists()) {
+      localProperties.load(FileInputStream(localPropertiesFile))
+    }
     maven {
       name = "GitHubPackages"
       url = uri("https://maven.pkg.github.com/tarkalabs/tarka-ui-kit-android")
       credentials {
-        username = System.getenv("GITHUB_USER")
-        password = System.getenv("GITHUB_TOKEN")
+        username =
+          System.getenv("GITHUB_USER") ?: localProperties.getProperty("GITHUB_USER")
+        password =
+          System.getenv("GITHUB_TOKEN") ?: localProperties.getProperty("GITHUB_TOKEN")
       }
     }
   }
 }
 
 dependencies {
-  val composeUiVersion = "1.4.1"
-  implementation("androidx.compose.runtime:runtime:$composeUiVersion")
-  implementation("androidx.compose.ui:ui:$composeUiVersion")
+  implementation("androidx.core:core-ktx:1.13.1")
+  implementation("androidx.appcompat:appcompat:1.7.0")
+  implementation(platform("androidx.compose:compose-bom:2024.10.00"))
+  implementation("androidx.compose.runtime:runtime")
+  implementation("androidx.compose.ui:ui")
   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")
-  androidTestImplementation("androidx.test.ext:junit:1.1.5")
+  androidTestImplementation("androidx.test.ext:junit:1.2.1")
   androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }
diff --git a/tarka-ui/build.gradle.kts b/tarka-ui/build.gradle.kts
@@ -1,8 +1,12 @@
 @file:Suppress("UnstableApiUsage")
 
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
   id("com.android.library")
   id("org.jetbrains.kotlin.android")
+  id("org.jetbrains.kotlin.plugin.compose")
   id("shot")
   id("maven-publish")
   id ("org.jetbrains.dokka")
@@ -34,12 +38,6 @@ android {
   kotlinOptions {
     jvmTarget = "17"
   }
-  buildFeatures {
-    compose = true
-  }
-  composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.11"
-  }
   packagingOptions {
     resources {
       excludes.add("/META-INF/{AL2.0,LGPL2.1}")
@@ -72,38 +70,45 @@ publishing {
   }
 
   repositories {
+    val localProperties = Properties()
+    val localPropertiesFile = File("local.properties")
+    if (localPropertiesFile.exists()) {
+      localProperties.load(FileInputStream(localPropertiesFile))
+    }
     maven {
       name = "GitHubPackages"
       url = uri("https://maven.pkg.github.com/tarkalabs/tarka-ui-kit-android")
       credentials {
-        username = System.getenv("GITHUB_USER")
-        password = System.getenv("GITHUB_TOKEN")
+        username =
+          System.getenv("GITHUB_USER") ?: localProperties.getProperty("GITHUB_USER")
+        password =
+          System.getenv("GITHUB_TOKEN") ?: localProperties.getProperty("GITHUB_TOKEN")
       }
     }
     mavenCentral()
   }
 }
 
 dependencies {
-  val composeUiVersion = "1.4.1"
-  implementation("androidx.core:core-ktx:1.10.0")
-  implementation("androidx.compose.ui:ui:$composeUiVersion")
-  implementation("androidx.compose.ui:ui-tooling-preview:$composeUiVersion")
-  implementation("androidx.compose.material3:material3:1.2.0")
-  implementation("androidx.compose.foundation:foundation:$composeUiVersion")
+  implementation("androidx.core:core-ktx:1.13.1")
+  implementation(platform("androidx.compose:compose-bom:2024.10.00"))
+  implementation("androidx.compose.ui:ui")
+  implementation("androidx.compose.ui:ui-tooling-preview")
+  implementation("androidx.compose.material3:material3:1.2.1")
+  implementation("androidx.compose.foundation:foundation")
   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")
+  androidTestImplementation("androidx.test.ext:junit:1.2.1")
   androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
   androidTestImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
   api("com.microsoft.design:fluent-system-icons:1.1.239@aar")
 
-  androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.3")
+  androidTestImplementation("androidx.compose.ui:ui-test-junit4")
   androidTestImplementation("org.mockito:mockito-android:4.5.1")
-  debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.3")
-  debugImplementation ("androidx.compose.ui:ui-tooling:1.4.3")
-  androidTestImplementation ("androidx.test:core:1.5.0")
+  debugImplementation("androidx.compose.ui:ui-test-manifest")
+  debugImplementation ("androidx.compose.ui:ui-tooling")
+  androidTestImplementation ("androidx.test:core:1.6.1")
 
 }
 
diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIMobileOverlayMenuItem.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUIMobileOverlayMenuItem.kt
@@ -17,6 +17,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -152,7 +153,7 @@ sealed class MobileOverlayMenuItemStyle {
       .background(color = bgColor)
       .clickable(
         interactionSource = interactionSource,
-        indication = rememberRipple(color = rippleColor),
+        indication = ripple(color = rippleColor),
         onClick = onMobileOverlayMenuItemClick
       )
       .testTag(tags.parentTag),