Skip to content

Commit 8a8c87a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into remadme-update
2 parents eadea8c + 2bae7ef commit 8a8c87a

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

.github/workflows/release.yaml

+6-9
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
cache: gradle
3333

3434
- name: Setup Gradle
35-
uses: gradle/gradle-build-action@2.11.1
35+
uses: gradle/gradle-build-action@v2.11.1
3636

3737
- name: Checkout Gradle Build Cache
3838
uses: actions/cache@v3
@@ -52,26 +52,23 @@ jobs:
5252
echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_OUTPUT
5353
5454
- name: Prepare environment
55-
env:
56-
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
57-
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
58-
run: echo '$GPG_KEY_CONTENTS' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'
55+
run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > '${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}'
5956

6057
- name: Release Artifacts
6158
run: |
6259
./gradlew publishAllPublicationsToMavenCentralRepository \
6360
-PVERSION_NAME=${{ steps.extract_version_name.outputs.VERSION_NAME }} \
64-
-PossrhUsername=${{ secrets.OSSRH_USERNAME }} \
65-
-PossrhPassword=${{ secrets.OSSRH_PASSWORD }} \
61+
-PmavenCentralUsername=${{ secrets.OSSRH_USERNAME }} \
62+
-PmavenCentralPassword=${{ secrets.OSSRH_PASSWORD }} \
6663
-Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} \
6764
-Psigning.password=${{ secrets.SIGNING_KEY_PASSWORD }} \
68-
-Psigning.secretKeyRingFile=${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
65+
-Psigning.secretKeyRingFile=$(pwd)/${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
6966
7067
github_release:
7168
needs: [ release_artifacts ]
7269
name: Create Release
7370
runs-on: ubuntu-latest
74-
if: ${{ !endsWith(needs.release_artifacts.outputs.VERSION_NAME,"SNAPSHOT") }}
71+
if: ${{ !endsWith(needs.release_artifacts.outputs.VERSION_NAME,'SNAPSHOT') }}
7572
steps:
7673
- uses: actions/checkout@v3
7774

CHANGELOG.md

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1-
# Change log
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
24

35
## [Unreleased]
46

5-
## [0.0.1-SNAPSHOT] - 2023-12-19
7+
### Added
8+
9+
### Changed
10+
11+
### Deprecated
12+
13+
### Removed
14+
15+
### Fixed
16+
17+
### Security
18+
19+
## [0.1.0] - 2023-12-21
620

721
Initial Cut (Get it?).

README.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[![Maven Central](https://img.shields.io/maven-central/v/me.sujanpoudel.mputils/paths?label=version&color=blue)](https://search.maven.org/search?q=me.sujanpoudel.mputils)
44
[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/me.sujanpoudel.mputils/paths?label=snapshot&server=https%3A%2F%2Fs01.oss.sonatype.org)](https://s01.oss.sonatype.org/content/repositories/snapshots/me/sujanpoudel/mputils/)
5+
[![CI](https://github.com/psuzn/mp-utils/actions/workflows/CI.yaml/badge.svg)](https://github.com/psuzn/mp-utils/actions/workflows/CI.yaml)
6+
57
[![kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue?logo=kotlin)](http://kotlinlang.org)
68
[![compose-multiplatform](https://img.shields.io/badge/Compose_Multiplatform-1.5.11-blue?logo=jetpackcompose)](https://github.com/JetBrains/compose-jb)
79

@@ -142,13 +144,7 @@ sealed class Platform {
142144
data class IOS(override val arch: Arch, val version: String, val isSimulator: Boolean) : OS(arch)
143145
data class WatchOs(override val arch: Arch, val version: String, val isSimulator: Boolean) : OS(arch)
144146
data class TvOs(override val arch: Arch, val version: String, val isSimulator: Boolean) : OS(arch)
145-
data class Android(
146-
override val arch: Arch,
147-
val buildNumber: Int,
148-
val androidVersion: String,
149-
val isWatch: Boolean,
150-
val isTv: Boolean
151-
) : OS(arch)
147+
data class Android(override val arch: Arch, val buildNumber: Int, val androidVersion: String, val isWatch: Boolean, val isTv: Boolean) : OS(arch)
152148

153149
data class Linux(override val arch: Arch, val version: String) : OS(arch)
154150
data class Windows(override val arch: Arch, val version: String) : OS(arch)

0 commit comments

Comments
 (0)