Skip to content

Commit 6271c8b

Browse files
authored
Merge pull request #1157 from mikepenz/develop
dev -> main
2 parents 5d2f27f + 5d1ffe0 commit 6271c8b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3296
-1859
lines changed

.github/config/configuration.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
]
2727
}
2828
],
29+
"template": "#{{CHANGELOG}}\n## Contributors:\n- #{{CONTRIBUTORS}}",
2930
"max_tags_to_fetch": 500
3031
}

README.md

Lines changed: 124 additions & 87 deletions
Large diffs are not rendered by default.

app-desktop/build.gradle.kts

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,26 @@ plugins {
44
id("com.mikepenz.aboutlibraries.plugin")
55
}
66

7-
dependencies {
8-
}
9-
107
kotlin {
118
jvm()
129

1310
sourceSets {
14-
val commonMain by getting {
15-
dependencies {
16-
17-
implementation(compose.desktop.currentOs)
18-
implementation(compose.foundation)
19-
implementation(compose.material)
20-
implementation(compose.material3)
21-
implementation(compose.components.resources)
22-
23-
implementation(project(":aboutlibraries-core"))
24-
implementation(project(":aboutlibraries-compose-m2"))
25-
implementation(project(":aboutlibraries-compose-m3"))
26-
27-
// Coroutines
28-
implementation(baseLibs.kotlinx.coroutines.core)
29-
30-
// example for parent via a parent
31-
// implementation("org.apache.commons:commons-csv:1.9.0")
32-
}
11+
commonMain.dependencies {
12+
implementation(compose.desktop.currentOs)
13+
implementation(compose.foundation)
14+
implementation(compose.material)
15+
implementation(compose.material3)
16+
implementation(compose.components.resources)
17+
18+
implementation(project(":aboutlibraries-core"))
19+
implementation(project(":aboutlibraries-compose-m2"))
20+
implementation(project(":aboutlibraries-compose-m3"))
21+
22+
// Coroutines
23+
implementation(baseLibs.kotlinx.coroutines.core)
24+
25+
// example for parent via a parent
26+
// implementation("org.apache.commons:commons-csv:1.9.0")
3327
}
3428
}
3529
}
@@ -45,7 +39,8 @@ aboutLibraries {
4539
registerAndroidTasks = false
4640
}
4741
export {
42+
variant = "jvmMain"
4843
prettyPrint = true
49-
outputPath = file("src/commonMain/composeResources/files/aboutlibraries.json")
44+
outputFile = file("src/commonMain/composeResources/files/aboutlibraries.json")
5045
}
5146
}

0 commit comments

Comments
 (0)