Skip to content

Commit 868f3a8

Browse files
shubertmshubertm
committed
Fix publish
1 parent c54a941 commit 868f3a8

File tree

5 files changed

+31
-33
lines changed

5 files changed

+31
-33
lines changed

‎amuze/build.gradle.kts

+7-8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
// `maven-publish`
88
alias(libs.plugins.com.vanniktech.maven.publish)
99
// signing
10+
alias(libs.plugins.jetbrains.compose.compiler)
1011
}
1112

1213
val versionName = "0.1.0"
@@ -56,20 +57,18 @@ dependencies {
5657
implementation(libs.androidx.appcompat)
5758
implementation(libs.androidx.activity.compose)
5859

59-
implementation(platform(libs.androidx.compose.bom))
60-
implementation(libs.androidx.ui)
61-
implementation(libs.androidx.ui.graphics)
62-
implementation(libs.androidx.ui.tooling.preview)
60+
implementation(libs.androidx.compose.ui)
61+
implementation(libs.androidx.compose.ui.graphics)
62+
implementation(libs.androidx.compose.ui.tooling.preview)
6363
implementation(libs.androidx.material3)
6464

6565
testImplementation(libs.junit)
6666
androidTestImplementation(libs.androidx.junit)
6767
androidTestImplementation(libs.androidx.espresso.core)
6868

69-
androidTestImplementation(platform(libs.androidx.compose.bom))
70-
androidTestImplementation(libs.androidx.ui.test.junit4)
71-
debugImplementation(libs.androidx.ui.tooling)
72-
debugImplementation(libs.androidx.ui.test.manifest)
69+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
70+
debugImplementation(libs.androidx.compose.ui.tooling)
71+
debugImplementation(libs.androidx.compose.ui.test.manifest)
7372

7473
}
7574

‎app/build.gradle.kts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.jetbrains.kotlin.android)
4+
alias(libs.plugins.jetbrains.compose.compiler)
45
}
56

67
android {
@@ -54,19 +55,18 @@ dependencies {
5455
implementation(libs.androidx.core.ktx)
5556
implementation(libs.androidx.lifecycle.runtime.ktx)
5657
implementation(libs.androidx.activity.compose)
57-
implementation(platform(libs.androidx.compose.bom))
58-
implementation(libs.androidx.ui)
59-
implementation(libs.androidx.ui.graphics)
60-
implementation(libs.androidx.ui.tooling.preview)
58+
59+
implementation(libs.androidx.compose.ui)
60+
implementation(libs.androidx.compose.ui.graphics)
61+
implementation(libs.androidx.compose.ui.tooling.preview)
6162
implementation(libs.androidx.material3)
6263

6364
implementation(project(":amuze"))
6465

6566
testImplementation(libs.junit)
6667
androidTestImplementation(libs.androidx.junit)
6768
androidTestImplementation(libs.androidx.espresso.core)
68-
androidTestImplementation(platform(libs.androidx.compose.bom))
69-
androidTestImplementation(libs.androidx.ui.test.junit4)
70-
debugImplementation(libs.androidx.ui.tooling)
71-
debugImplementation(libs.androidx.ui.test.manifest)
69+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
70+
debugImplementation(libs.androidx.compose.ui.tooling)
71+
debugImplementation(libs.androidx.compose.ui.test.manifest)
7272
}

‎app/src/main/java/com/infbyte/amuze_android/MainActivity.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ fun PreviewAboutScreen() {
6767
appVersion = "1.0",
6868
R.drawable.ic_amuzic_foreground,
6969
privacyPolicyLinkRes = R.string.amuze_privacy_policy
70-
) {
71-
72-
}
70+
) {}
7371
}
7472
}
7573

‎build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.jetbrains.kotlin.android) apply false
55
alias(libs.plugins.android.library) apply false
6+
alias(libs.plugins.jetbrains.compose.compiler) apply false
67
}

‎gradle/libs.versions.toml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
agp = "8.5.1"
3-
kotlin = "1.9.0"
3+
kotlin = "2.0.20"
44
coreKtx = "1.13.1"
55
junit = "4.13.2"
66
junitVersion = "1.2.1"
77
espressoCore = "3.6.1"
8-
lifecycleRuntimeKtx = "2.8.4"
9-
activityCompose = "1.9.1"
10-
composeBom = "2024.04.01"
8+
lifecycleRuntimeKtx = "2.8.5"
9+
activityCompose = "1.9.2"
10+
compose = "1.7.1"
11+
material3 = "1.3.0"
1112
appcompat = "1.7.0"
12-
material = "1.12.0"
1313
vMavenPublish = "0.29.0"
1414

1515
[libraries]
@@ -19,19 +19,19 @@ androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "j
1919
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
2020
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
2121
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
22-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
23-
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
24-
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
25-
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
26-
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
27-
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
28-
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
29-
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
22+
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
23+
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "compose" }
24+
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" }
25+
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" }
26+
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose" }
27+
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "compose" }
28+
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
3029
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
31-
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
3230

3331
[plugins]
3432
android-application = { id = "com.android.application", version.ref = "agp" }
3533
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3634
android-library = { id = "com.android.library", version.ref = "agp" }
3735
com-vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vMavenPublish"}
36+
jetbrains-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
37+

0 commit comments

Comments
 (0)