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
13 changes: 8 additions & 5 deletions chai/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ plugins {

android {
namespace = "com.droidconke.chai"
compileSdk = 34
compileSdk = 36

defaultConfig {
minSdk = 26
minSdk = 28

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -44,8 +44,10 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
}
}
buildFeatures {
compose = true
Expand All @@ -60,7 +62,8 @@ dependencies {

implementation(libs.androidx.core.ktx)
implementation(platform(libs.androidx.compose.bom))
implementation (libs.material3)
implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.material3)
implementation(libs.androidx.appcompat)
implementation(libs.material)
implementation(libs.androidx.runtime.android)
Expand Down
10 changes: 5 additions & 5 deletions chai/src/main/java/com/droidconke/chai/components/CButtons.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ package com.droidconke.chai.components
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.Send
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.ButtonDefaults
Expand All @@ -37,6 +35,8 @@ import com.droidconke.chai.utils.Alpha.AlphaDisabled
import com.droidconke.chai.utils.CShapes
import com.droidconke.chai.utils.ChaiPreview
import com.droidconke.chai.utils.Space5
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.Send

@Composable
fun CButton(
Expand Down Expand Up @@ -178,7 +178,7 @@ fun CPrimaryOutlinedButtonLightPreview() {
onClick = { },
title = PREVIEW_OUTLINE_BUTTON_TITLE,
modifier = Modifier.fillMaxWidth(),
icon = Icons.AutoMirrored.Outlined.Send
icon = Icons.AutoMirrored.Filled.Send
)
}
}
Expand All @@ -191,7 +191,7 @@ fun CPrimaryOutlinedButtonDarkPreview() {
onClick = { },
title = PREVIEW_OUTLINE_BUTTON_TITLE,
modifier = Modifier.fillMaxWidth(),
icon = Icons.AutoMirrored.Outlined.Send
icon = Icons.AutoMirrored.Filled.Send
)
}
}
Expand All @@ -204,7 +204,7 @@ fun PrimaryOutlinedButtonPreview() {
onClick = { },
title = PREVIEW_OUTLINE_BUTTON_TITLE,
modifier = Modifier.fillMaxWidth(),
icon = Icons.AutoMirrored.Outlined.Send
icon = Icons.AutoMirrored.Filled.Send
)
}
}
12 changes: 7 additions & 5 deletions chaidemo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ plugins {

android {
namespace = "com.droidconke.chaidemo"
compileSdk = 34
compileSdk = 36

defaultConfig {
applicationId = "com.droidconke.chaidemo"
minSdk = 26
targetSdk = 34
minSdk = 28
targetSdk = 36
versionCode = 1
versionName = "1.0"

Expand All @@ -49,8 +49,10 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
}
}

buildFeatures {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ class ChaiLinterIssueRegistry : IssueRegistry() {
* system usage based on the chai design system. They will exist in the [detectors] package.
*
*/
@Suppress("UNCHECKED_CAST")
override val issues: List<Issue> = listOf(
ChaiIncorrectUsageDetector.ISSUE,
IncorrectColourUsageDetector.ISSUE,

) as List<Issue>


override val api: Int = CURRENT_API
override val minApi: Int = 12

Expand Down
41 changes: 20 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[versions]
agp = "8.5.2"
kotlin = "2.0.10"
agp = "8.13.0"
kotlin = "2.2.20"
junit = "4.13.2"
composeBom = "2024.06.00"
lint = "31.5.2"
lintTests = "31.5.2"
coreKtx = "1.13.1"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
lifecycleRuntimeKtx = "2.8.4"
activityCompose = "1.9.1"
jetbrainsKotlinJvm = "2.0.10"
appcompatVersion = "1.7.0"
material3 = "1.2.1"
materialVersion = "1.12.0"
compose-plugin = "1.6.11"
runtimeAndroid = "1.6.8"
material3Android = "1.2.1"
uiToolingPreviewAndroid = "1.6.8"
uiTooling = "1.6.8"
composeBom = "2025.10.01"
lint = "31.13.0"
lintTests = "31.13.0"
coreKtx = "1.17.0"
junitVersion = "1.3.0"
espressoCore = "3.7.0"
lifecycleRuntimeKtx = "2.9.4"
activityCompose = "1.11.0"
jetbrainsKotlinJvm = "2.2.20"
appcompatVersion = "1.7.1"
materialVersion = "1.13.0"
compose-plugin = "1.9.1"
runtimeAndroid = "1.9.4"
material3Android = "1.4.0"
uiToolingPreviewAndroid = "1.9.4"
uiTooling = "1.9.4"

[libraries]
android-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lintTests" }
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version = "2.0.0" }
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" }
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
lint-api = { group = "com.android.tools.lint", name = "lint-api", version.ref = "lint" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
Expand All @@ -43,7 +43,6 @@ material = { group = "com.google.android.material", name = "material", version.r
androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }
androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "uiTooling" }


Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Mon Jul 15 23:39:57 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down