Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use compose.components.resources for typography #459

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
Update composeMultiplatform to 1.6.0-dev1383 and remove materialIcons…
…Extended dependency
  • Loading branch information
serbelga committed Jan 22, 2024
commit 35460deb50e2634dea03026a8d8195351cdc837a
2 changes: 1 addition & 1 deletion app-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.composeMultiplatform)
kotlin("android")
alias(libs.plugins.composeMultiplatform)
id("com.google.android.gms.oss-licenses-plugin")
id("todometer.spotless")
id("todometer.dependency-graph-generator")
Expand Down
2 changes: 1 addition & 1 deletion app-desktop/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.spotless")
id("todometer.dependency-graph-generator")
}
Expand Down
2 changes: 1 addition & 1 deletion app-ios/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.spotless")
id("todometer.dependency-graph-generator")
}
Expand Down
2 changes: 1 addition & 1 deletion app/common/designsystem/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
3 changes: 1 addition & 2 deletions app/common/ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand All @@ -20,7 +20,6 @@ kotlin {
api(compose.runtime)
api(compose.foundation)
api(compose.material3)
api(compose.materialIconsExtended)
api(compose.ui)

implementation(projects.app.common.designsystem)
Expand Down
2 changes: 1 addition & 1 deletion app/feature/about/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/addtask/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/addtasklist/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/edittask/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/edittasklist/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/home/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/settings/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
2 changes: 1 addition & 1 deletion app/feature/taskdetails/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand Down
3 changes: 1 addition & 2 deletions common/ui/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidLibrary)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
id("todometer.common.library.android")
id("todometer.dependency-graph-generator")
id("todometer.spotless")
Expand All @@ -20,7 +20,6 @@ kotlin {
api(compose.runtime)
api(compose.foundation)
api(compose.material3)
api(compose.materialIconsExtended)
api(compose.ui)

implementation(projects.common.domain)
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ androidWearTargetSdk = "33"
animationGraphicsAndroid = "1.5.4"
appcompat = "1.6.1"
composeCompiler = "1.5.7"
composeMultiplatform = "1.6.0-alpha01"
composeMultiplatform = "1.6.0-dev1383"
composeVectorize = "0.1.0"
dataStore = "1.1.0-beta01"
dependencyGraphGenerator = "0.8.0"
Expand All @@ -22,7 +22,7 @@ glance = "1.0.0"
googleServices = "4.4.0"
junit = "4.13.2"
koinBom = "3.5.3"
kotlin = "1.9.20"
kotlin = "1.9.22"
kotlinCoroutines = "1.7.3"
kotlinDatetime = "0.5.0"
kotlinSerializationJson = "1.6.2"
Expand Down
2 changes: 1 addition & 1 deletion wearapp-wearos/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.composeMultiplatform)
kotlin("android")
alias(libs.plugins.composeMultiplatform)
id("todometer.spotless")
id("todometer.dependency-graph-generator")
}
Expand Down
Loading