Skip to content

Commit 3bfda7c

Browse files
authored
Merge pull request #140 from solrudev/develop
0.16.0
2 parents 590f5a2 + aca1616 commit 3bfda7c

41 files changed

Lines changed: 1582 additions & 196 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,25 @@ jobs:
3131
run: |
3232
./gradlew :buildAckpine --stacktrace
3333
34+
status-check:
35+
runs-on: ubuntu-latest
36+
if: always()
37+
needs: [ build ]
38+
39+
steps:
40+
- name: Check
41+
run: |
42+
results=$(tr -d '\n' <<< '${{ toJSON(needs.*.result) }}')
43+
if ! grep -q -v -E '(failure|cancelled)' <<< "$results"; then
44+
echo "One or more required jobs failed"
45+
exit 1
46+
fi
47+
3448
publish:
3549
name: Upload artifacts
3650
runs-on: ubuntu-latest
3751
if: github.repository == 'solrudev/Ackpine' && github.event.pull_request.base.ref == 'master' && github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release')
38-
needs: [ build ]
52+
needs: [ status-check ]
3953

4054
steps:
4155
- name: Checkout
@@ -62,7 +76,7 @@ jobs:
6276
name: Publish documentation
6377
runs-on: ubuntu-latest
6478
if: github.repository == 'solrudev/Ackpine' && github.event.pull_request.base.ref == 'master' && github.event.pull_request.merged == true
65-
needs: [ build ]
79+
needs: [ status-check ]
6680

6781
permissions:
6882
contents: write

.github/workflows/github-release.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,9 @@ on:
66
- "[0-9]+.[0-9]+.[0-9]+*"
77

88
jobs:
9-
build:
10-
runs-on: ubuntu-latest
11-
name: Build Ackpine
12-
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v4
16-
with:
17-
persist-credentials: false
18-
19-
- name: Setup environment
20-
uses: ./.github/actions/setup-gradle-environment-action
21-
with:
22-
gradle-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
23-
24-
- name: Validate binary compatibility
25-
run: |
26-
./gradlew apiCheck || { exit_code=$?; printf "*** This PR changes Ackpine's public API. If this is intentional, run './gradlew apiDump' and commit the new API dumps. ***"; exit $exit_code; }
27-
28-
- name: Build
29-
run: |
30-
./gradlew :buildAckpine --stacktrace
31-
329
release-samples:
33-
name: Release samples
10+
name: Create GitHub release
3411
runs-on: ubuntu-latest
35-
needs: [ build ]
3612

3713
permissions:
3814
contents: write

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Ackpine depends on Jetpack libraries, so it's also necessary to add the `google(
3535

3636
```toml
3737
[versions]
38-
ackpine = "0.15.3"
38+
ackpine = "0.16.0"
3939

4040
[libraries]
4141
ackpine-core = { module = "ru.solrudev.ackpine:ackpine-core", version.ref = "ackpine" }
@@ -76,7 +76,7 @@ ackpine = [
7676

7777
```kotlin
7878
dependencies {
79-
val ackpineVersion = "0.15.3"
79+
val ackpineVersion = "0.16.0"
8080
implementation("ru.solrudev.ackpine:ackpine-core:$ackpineVersion")
8181

8282
// optional - Kotlin extensions and Coroutines support

ackpine-api/api-main/api/api-main.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public abstract interface class ru/solrudev/ackpine/plugability/AckpinePlugin {
406406
public abstract fun getId ()Ljava/lang/String;
407407
}
408408

409-
public abstract interface class ru/solrudev/ackpine/plugability/AckpinePlugin$Parameters : java/io/Serializable {
409+
public abstract interface class ru/solrudev/ackpine/plugability/AckpinePlugin$Parameters {
410410
}
411411

412412
public final class ru/solrudev/ackpine/plugability/AckpinePlugin$Parameters$None : ru/solrudev/ackpine/plugability/AckpinePlugin$Parameters {

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/DisposableSubscription.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public class DisposableSubscriptionContainer : DisposableSubscription {
7272
}
7373
}
7474

75+
/**
76+
* No-op [DisposableSubscription].
77+
*/
7578
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
7679
public data object DummyDisposableSubscription : DisposableSubscription {
7780
override val isDisposed: Boolean = true

ackpine-api/api-main/src/main/kotlin/ru/solrudev/ackpine/plugability/AckpinePlugin.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package ru.solrudev.ackpine.plugability
1818

1919
import ru.solrudev.ackpine.installer.parameters.InstallParameters
20-
import java.io.Serializable
2120

2221
/**
2322
* A plugin for Ackpine. Allows to extend Ackpine's functionality.
@@ -38,15 +37,11 @@ public interface AckpinePlugin<Params : AckpinePlugin.Parameters> {
3837
/**
3938
* A set of parameters for [AckpinePlugin].
4039
*/
41-
public interface Parameters : Serializable {
40+
public interface Parameters {
4241

4342
/**
4443
* Empty [AckpinePlugin] parameters for plugins without configuration.
4544
*/
46-
public data object None : Parameters {
47-
@Suppress("Unused")
48-
private const val serialVersionUID = -8443803615690115391L
49-
private fun readResolve(): Any = None
50-
}
45+
public data object None : Parameters
5146
}
5247
}

0 commit comments

Comments
 (0)