Skip to content

Commit 3ef9802

Browse files
aliernfrogaliernfrog
authored
chore: merge branch 2.0.1-hotfix-dev into main 
2 parents 54c642b + 2074511 commit 3ef9802

File tree

6 files changed

+105
-91
lines changed

6 files changed

+105
-91
lines changed

‎.github/workflows/commit.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,12 @@ jobs:
1919
cache: gradle
2020

2121
- name: Build with Gradle
22-
run: ./gradlew assembleRelease
22+
run: |
23+
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > $GITHUB_WORKSPACE/key.jks
24+
./gradlew assembleRelease -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.jks -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
2325
24-
- name: Sign demo APK
25-
id: sign_apk
26-
uses: ilharp/sign-android-release@v1
27-
with:
28-
releaseDir: ./demo/build/outputs/apk/release/
29-
signingKey: ${{ secrets.KEYSTORE_BASE64 }}
30-
keyAlias: ${{ secrets.KEYSTORE_ALIAS }}
31-
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
32-
keyPassword: ${{ secrets.KEY_PASSWORD }}
33-
34-
- name: Rename signed APK
35-
run: mv ${{steps.sign_apk.outputs.signedFile}} toptoast_demo.apk
26+
- name: Rename demo APK
27+
run: mv demo/build/outputs/apk/release/demo-release.apk toptoast_demo.apk
3628

3729
- name: Upload artifacts
3830
uses: actions/upload-artifact@v4

‎.github/workflows/release-alpha.yml‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,42 @@ jobs:
2121
cache: gradle
2222

2323
- name: Build with Gradle
24-
run: ./gradlew assembleRelease
24+
run: |
25+
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > $GITHUB_WORKSPACE/key.jks
26+
./gradlew assembleRelease -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.jks -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
2527
26-
- name: Sign demo APK
27-
id: sign_apk
28-
uses: ilharp/sign-android-release@v1
29-
with:
30-
releaseDir: ./demo/build/outputs/apk/release/
31-
signingKey: ${{ secrets.KEYSTORE_BASE64 }}
32-
keyAlias: ${{ secrets.KEYSTORE_ALIAS }}
33-
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
34-
keyPassword: ${{ secrets.KEY_PASSWORD }}
35-
36-
- name: Rename signed APK
37-
run: mv ${{steps.sign_apk.outputs.signedFile}} toptoast_demo.apk
28+
- name: Rename demo APK
29+
run: mv demo/build/outputs/apk/release/demo-release.apk toptoast_demo.apk
3830

39-
- name: Create release
40-
uses: marvinpinto/action-automatic-releases@v1.2.1
31+
- name: Generate changelog
32+
id: changelog
33+
uses: requarks/changelog-action@v1
4134
with:
42-
repo_token: ${{ secrets.GITHUB_TOKEN }}
35+
token: ${{ secrets.GITHUB_TOKEN }}
36+
tag: ${{ github.ref_name }}
37+
writeToFile: false
38+
excludeTypes: ci,other,style
39+
40+
- name: Create Release
41+
uses: ncipollo/release-action@v1.12.0
42+
with:
43+
allowUpdates: true
4344
draft: false
45+
makeLatest: true
4446
prerelease: true
45-
files: |
46-
toptoast_demo.apk
47+
name: ${{ github.ref_name }}
48+
body: ${{ steps.changelog.outputs.changes }}
49+
token: ${{ github.token }}
50+
artifacts: "toptoast_demo.apk"
4751

4852
- name: Publish package
4953
run: ./gradlew publish
5054
env:
5155
GITHUB_PACKAGES_URL: https://maven.pkg.github.com/${{ github.repository }}
52-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57+
58+
- name: Upload artifacts
59+
uses: actions/upload-artifact@v4
60+
with:
61+
name: toptoast_demo
62+
path: toptoast_demo.apk

‎.github/workflows/release.yml‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,42 @@ jobs:
2222
cache: gradle
2323

2424
- name: Build with Gradle
25-
run: ./gradlew assembleRelease
25+
run: |
26+
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > $GITHUB_WORKSPACE/key.jks
27+
./gradlew assembleRelease -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/key.jks -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
2628
27-
- name: Sign demo APK
28-
id: sign_apk
29-
uses: ilharp/sign-android-release@v1
30-
with:
31-
releaseDir: ./demo/build/outputs/apk/release/
32-
signingKey: ${{ secrets.KEYSTORE_BASE64 }}
33-
keyAlias: ${{ secrets.KEYSTORE_ALIAS }}
34-
keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
35-
keyPassword: ${{ secrets.KEY_PASSWORD }}
29+
- name: Rename demo APK
30+
run: mv demo/build/outputs/apk/release/demo-release.apk toptoast_demo.apk
3631

37-
- name: Rename signed APK
38-
run: mv ${{steps.sign_apk.outputs.signedFile}} toptoast_demo.apk
39-
40-
- name: Create release
41-
uses: marvinpinto/action-automatic-releases@v1.2.1
32+
- name: Generate changelog
33+
id: changelog
34+
uses: requarks/changelog-action@v1
35+
with:
36+
token: ${{ secrets.GITHUB_TOKEN }}
37+
tag: ${{ github.ref_name }}
38+
writeToFile: false
39+
excludeTypes: ci,other,style
40+
41+
- name: Create Release
42+
uses: ncipollo/release-action@v1.12.0
4243
with:
43-
repo_token: ${{ secrets.GITHUB_TOKEN }}
44+
allowUpdates: true
4445
draft: false
46+
makeLatest: true
4547
prerelease: false
46-
files: |
47-
toptoast_demo.apk
48+
name: ${{ github.ref_name }}
49+
body: ${{ steps.changelog.outputs.changes }}
50+
token: ${{ github.token }}
51+
artifacts: "toptoast_demo.apk"
4852

4953
- name: Publish package
5054
run: ./gradlew publish
5155
env:
5256
GITHUB_PACKAGES_URL: https://maven.pkg.github.com/${{ github.repository }}
53-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
59+
- name: Upload artifacts
60+
uses: actions/upload-artifact@v4
61+
with:
62+
name: toptoast_demo
63+
path: toptoast_demo.apk

‎README.md‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
# TopToast
2-
[![GitHub Packages](https://img.shields.io/github/v/tag/aliernfrog/top-toast-compose?label=GitHub)](https://github.com/aliernfrog/top-toast-compose/packages)
3-
[![JitPack](https://jitpack.io/v/aliernfrog/top-toast-compose.svg)](https://jitpack.io/#aliernfrog/top-toast-compose)
2+
[![JitPack](https://jitpack.io/v/aliernfrog/top-toast-compose.svg)](https://jitpack.io/#aliernfrog/top-toast-compose)
3+
[![GitHub Packages](https://img.shields.io/github/v/tag/aliernfrog/top-toast-compose?label=GitHub)](https://github.com/aliernfrog/top-toast-compose/packages)
44

55
Toast library for Jetpack Compose
66

77
## 👀 Try it out
88
You can try TopToast by downloading demo application from [releases](https://github.com/aliernfrog/top-toast-compose/releases)
99

1010
## 📥 Installation
11-
You can get the library from GitHub Packages or JitPack
12-
### GitHub Packages
13-
- Create a GitHub PAT with `read:packages` scope
14-
- Put the PAT and your GitHub username in global/project `gradle.properties`:
15-
```
16-
gpr.user=MyUserName
17-
gpr.key=MyPAT
18-
```
19-
or supply `GITHUB_ACTOR` (username) and `GITHUB_TOKEN` (PAT) in environment variables
20-
- Add maven repository: (Kotlin)
21-
```kts
22-
maven(url = "https://maven.pkg.github.com/aliernfrog/top-toast-compose") {
23-
credentials {
24-
username = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
25-
password = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
26-
}
27-
}
28-
```
29-
- Add dependency: (Kotlin)
30-
```kts
31-
implementation("aliernfrog:top-toast-compose:<VERSION>")
32-
```
33-
34-
### JitPack
35-
> [!WARNING]
36-
> As JitPack now fails to build with no reason, latest versions available on JitPack are `1.3.4` and `1.3.5-alpha01`.
37-
> It may or may not be updated in the future.
38-
- Add maven repository: (Kotlin)
39-
```kts
40-
maven(url = "https://jitpack.io")
41-
```
42-
- Add dependency: (Kotlin)
43-
```kts
44-
implementation("com.github.aliernfrog:top-toast-compose:<VERSION>")
45-
```
11+
<details open>
12+
<summary>JitPack</summary>
13+
14+
- Add maven repository: (Kotlin)
15+
```kts
16+
maven(url = "https://jitpack.io")
17+
```
18+
- Add dependency: (Kotlin)
19+
```kts
20+
implementation("com.github.aliernfrog:top-toast-compose:<VERSION>")
21+
```
22+
</details>
23+
<details>
24+
<summary>GitHub Packages</summary>
25+
26+
- Create a GitHub PAT with `read:packages` scope
27+
- Put the PAT and your GitHub username in global/project `gradle.properties`:
28+
```
29+
gpr.user=MyUserName
30+
gpr.key=MyPAT
31+
```
32+
or supply `GITHUB_ACTOR` (username) and `GITHUB_TOKEN` (PAT) in environment variables
33+
- Add maven repository: (Kotlin)
34+
```kts
35+
maven(url = "https://maven.pkg.github.com/aliernfrog/top-toast-compose") {
36+
credentials {
37+
username = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
38+
password = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
39+
}
40+
}
41+
```
42+
- Add dependency: (Kotlin)
43+
```kts
44+
implementation("aliernfrog:top-toast-compose:<VERSION>")
45+
```
46+
</details>
4647

4748
## 🍞 Example usage
4849
```kotlin

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
55
}
66

7-
val libraryVersionName by extra { "2.0.0" }
8-
val libraryVersionCode by extra { 200 }
7+
val libraryVersionName by extra { "2.0.1" }
8+
val libraryVersionCode by extra { 20110 }
99

1010
val coreVersion by extra { "1.12.0" }
1111
val composeCompilerVersion by extra { "1.5.8" }

‎jitpack.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
jdk: openjdk20
1+
jdk:
2+
- openjdk17

0 commit comments

Comments
 (0)