Skip to content

Commit 3038539

Browse files
authored
Merge pull request #1043 from mikepenz/develop
dev -> main
2 parents a97cfb9 + 77a0791 commit 3038539

40 files changed

+679
-724
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v3
37+
uses: gradle/actions/setup-gradle@v4
3838

3939
- name: Cache konan
4040
uses: actions/cache@v4
@@ -108,20 +108,24 @@ jobs:
108108
15
109109
17
110110
111+
- name: Setup Gradle
112+
uses: gradle/actions/setup-gradle@v4
113+
111114
- name: Validate gradle wrapper
112-
uses: gradle/wrapper-validation-action@v2
115+
uses: gradle/actions/wrapper-validation@v3
113116

114117
- name: Copy CI gradle.properties
115118
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
116119

117-
- name: Setup Gradle
118-
uses: gradle/actions/setup-gradle@v3
119-
120120
- name: Publish plugin locally
121121
run: |
122122
cd plugin-build
123123
./gradlew publishToMavenLocal
124124
125+
- name: Run Lint on Gradle Plugin
126+
run: |
127+
./gradlew plugin-build:plugin:lint
128+
125129
- name: Build Debug
126130
run: ./gradlew app:assembleDebug
127131

@@ -173,7 +177,7 @@ jobs:
173177

174178
- name: Build Changelog
175179
id: github_release
176-
uses: mikepenz/release-changelog-builder-action@v4
180+
uses: mikepenz/release-changelog-builder-action@v5
177181
if: startsWith(github.ref, 'refs/tags/')
178182
with:
179183
configuration: ".github/config/configuration.json"

.github/workflows/gradle-dependency-submission.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2626

2727
- name: Setup Gradle & Submit dependency graphs
28-
uses: gradle/actions/setup-gradle@v3
28+
uses: gradle/actions/setup-gradle@v4
2929
with:
3030
dependency-graph: generate-and-submit

.github/workflows/static.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ jobs:
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v4
34+
3435
- name: Setup Pages
35-
uses: actions/configure-pages@v4
36+
uses: actions/configure-pages@v5
37+
3638
- uses: actions/setup-java@v4
3739
with:
3840
distribution: 'zulu'
3941
java-version: |
4042
11
4143
17
4244
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v3
45+
uses: gradle/actions/setup-gradle@v4
4446
- name: Build Page
4547
run: |
4648
./gradlew :app-wasm:exportLibraryDefinitions -PaboutLibraries.exportPath=src/commonMain/composeResources/files/

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ GEM
7777
open4 (1.3.4)
7878
public_suffix (5.0.1)
7979
rchardet (1.8.0)
80-
rexml (3.2.5)
80+
rexml (3.3.9)
8181
ruby-ll (2.1.2)
8282
ansi
8383
ast

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<a href="#whats-included-">What's included 🚀</a> &bull;
1010
<a href="#setup">Setup 🛠️</a> &bull;
1111
<a href="#gradle-api">Gradle API️</a> &bull;
12-
<a href="https://mikepenz.github.io/AboutLibraries/index.html">SDK Docs 📖 </a> &bull;
13-
<a href="https://mikepenz.github.io/AboutLibraries/plugin/index.html">Plugin Docs 📖</a> &bull;
1412
<a href="MIGRATION.md">Migration Guide 🧬</a> &bull;
1513
<a href="https://play.google.com/store/apps/details?id=com.mikepenz.aboutlibraries.sample">Sample App</a>
1614
</p>
@@ -39,7 +37,8 @@
3937

4038
## Latest releases 🛠
4139

42-
- Kotlin 2.x && Multiplatform && Compose && Plugin | [v11.2.3](https://github.com/mikepenz/AboutLibraries/tree/v11.2.3)
40+
- [v11.2.3](https://github.com/mikepenz/AboutLibraries/tree/v11.2.3)
41+
- Compile 35 | Gradle 7.0+ | [v11.3.0](https://github.com/mikepenz/AboutLibraries/tree/v11.3.0
4342

4443
## Gradle Plugin
4544

aboutlibraries-compose-m2/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
}
2222

2323
buildTypes {
24-
getByName("release") {
24+
named("release") {
2525
isMinifyEnabled = false
2626
proguardFiles(
2727
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
@@ -34,7 +34,7 @@ android {
3434
targetCompatibility = JavaVersion.VERSION_11
3535
}
3636

37-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
37+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
3838
kotlinOptions {
3939
jvmTarget = "11"
4040

@@ -133,7 +133,7 @@ tasks.dokkaHtml.configure {
133133

134134
if (project.hasProperty("pushall") || project.hasProperty("library_compose_only")) {
135135
mavenPublishing {
136-
publishToMavenCentral(SonatypeHost.S01)
136+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
137137
signAllPublications()
138138
}
139139
}

aboutlibraries-compose-m3/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
}
2222

2323
buildTypes {
24-
getByName("release") {
24+
named("release") {
2525
isMinifyEnabled = false
2626
proguardFiles(
2727
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
@@ -34,7 +34,7 @@ android {
3434
targetCompatibility = JavaVersion.VERSION_11
3535
}
3636

37-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
37+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
3838
kotlinOptions {
3939
jvmTarget = "11"
4040
if (project.findProperty("composeCompilerReports") == "true") {
@@ -131,7 +131,7 @@ tasks.dokkaHtml.configure {
131131

132132
if (project.hasProperty("pushall") || project.hasProperty("library_compose_m3_only")) {
133133
mavenPublishing {
134-
publishToMavenCentral(SonatypeHost.S01)
134+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
135135
signAllPublications()
136136
}
137137
}

aboutlibraries-core/build.gradle.kts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
}
2020

2121
buildTypes {
22-
getByName("release") {
22+
named("release") {
2323
isMinifyEnabled = false
2424
}
2525
}
@@ -29,7 +29,7 @@ android {
2929
targetCompatibility = JavaVersion.VERSION_11
3030
}
3131

32-
tasks.withType<KotlinCompile> {
32+
tasks.withType<KotlinCompile>().configureEach {
3333
kotlinOptions {
3434
jvmTarget = "11"
3535
freeCompilerArgs += listOf(
@@ -52,7 +52,7 @@ kotlin {
5252
js(IR) {
5353
nodejs {}
5454
browser {}
55-
compilations.all {
55+
compilations.configureEach {
5656
kotlinOptions {
5757
moduleKind = "umd"
5858
sourceMap = true
@@ -94,9 +94,15 @@ kotlin {
9494
watchosDeviceArm64()
9595

9696
// common sets
97-
ios()
98-
tvos()
99-
watchos()
97+
iosX64()
98+
iosArm64()
99+
iosSimulatorArm64()
100+
tvosX64()
101+
tvosArm64()
102+
tvosSimulatorArm64()
103+
watchosX64()
104+
watchosArm64()
105+
watchosSimulatorArm64()
100106

101107
/*
102108
cocoapods {
@@ -154,7 +160,7 @@ tasks.dokkaHtml.configure {
154160

155161
if (project.hasProperty("pushall") || project.hasProperty("library_core_only")) {
156162
mavenPublishing {
157-
publishToMavenCentral(SonatypeHost.S01)
163+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
158164
signAllPublications()
159165
}
160166
}

aboutlibraries/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dependencies {
7575
import com.vanniktech.maven.publish.SonatypeHost
7676
if (project.hasProperty('pushall') || project.hasProperty('library_only')) {
7777
mavenPublishing {
78-
publishToMavenCentral(SonatypeHost.S01)
78+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
7979
signAllPublications()
8080
}
8181
}

app-desktop/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
### Run Desktop app
1010

11-
```
11+
```bash
1212
./gradlew :app-desktop:run
1313
```

0 commit comments

Comments
 (0)