Skip to content

Commit

Permalink
Updating Projects Main Dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
Younes-Charfaoui committed Oct 23, 2024
1 parent 54aeb8c commit a9b384f
Show file tree
Hide file tree
Showing 11 changed files with 247 additions and 48 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ local.properties
.idea/deploymentTargetDropDown.xml
.idea/gradle.xml
.idea/misc.xml

# Kotlin 2.0
.kotlin/
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 1 addition & 6 deletions example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
plugins {
id ("com.android.application")
id ("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose")
}

android {
Expand Down Expand Up @@ -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}")
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
13 changes: 11 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@file:Suppress("UnstableApiUsage")

import java.io.FileInputStream
import java.util.Properties


pluginManagement {
Expand All @@ -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")
}
}
}
Expand Down
35 changes: 20 additions & 15 deletions tarka-ui-icons/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -31,13 +36,6 @@ android {
kotlinOptions {
jvmTarget = "17"
}

buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.11"
}
}


Expand All @@ -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")
}
43 changes: 24 additions & 19 deletions tarka-ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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")

}

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down
72 changes: 72 additions & 0 deletions tarkaicons/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("maven-publish")
}

android {
namespace = "com.tarkalabs.tarkaicons"
compileSdk = 33

defaultConfig {
minSdk = 24

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
}


publishing {
publications {
create<MavenPublication>("gpr") {
run {
groupId = "com.tarkalabs"
artifactId = "tarkaicons"
version = "1.0.0"
artifact("$buildDir/outputs/aar/tarkaicons-release.aar")
}
}
}

repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/REPOSITORY_URL_HERE")
credentials {
username = System.getenv("GITHUB_USER")
password = System.getenv("GITHUB_TOKEN")
}
}
}
}

dependencies {
val composeUiVersion = "1.4.1"

implementation("androidx.compose.ui:ui:$composeUiVersion")
implementation("androidx.compose.ui:ui-tooling-preview:$composeUiVersion")
implementation("androidx.compose.material3:material3:1.1.0-rc01")
implementation("androidx.compose.foundation:foundation:$composeUiVersion")
api("com.microsoft.design:fluent-system-icons:1.1.201@aar")
implementation("androidx.core:core-ktx:1.10.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}
Loading

0 comments on commit a9b384f

Please sign in to comment.