Skip to content

Commit

Permalink
Release 2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
andrei-cristea committed Sep 14, 2022
1 parent a95d686 commit 1bbb338
Show file tree
Hide file tree
Showing 16 changed files with 77 additions and 258 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/java-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Compile and Deploy Java Api to Maven Central

on:
push:
branches:
- main

jobs:
java-publish:
runs-on: ubuntu-latest
steps:
- name: Check out repository code from ${{ github.repository }}/${{ github.ref }}
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
- name: Write gradle.properties
run: |
mkdir -p ~/.gradle
echo "${{ secrets.GRADLE_PROPERTIES }}" | base64 -d > ~/.gradle/gradle.properties
- name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
gpg --pinentry-mode loopback --passphrase "${{ secrets.OSSRH_GPG_SECRET_PASSWORD }}" --export-secret-key 568FD16F857171A0EC6D2C40742C84722FD2B235 > ~/.gradle/maven-central.gpg
gpg --list-secret-keys --keyid-format LONG
- name: Check version
working-directory: .
run: ./.github/scripts/check_version.sh
- name: Build and Publish
working-directory: .
run: ./gradlew build test publish --info --stacktrace
35 changes: 35 additions & 0 deletions .github/workflows/java-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Release Java API to Maven Central

on:
release:
types:
- published

jobs:
java-release:
runs-on: ubuntu-latest
steps:
- name: Check out repository code from ${{ github.repository }}/${{ github.ref }}
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
- name: Write gradle.properties
run: |
mkdir -p ~/.gradle
echo "${{ secrets.GRADLE_PROPERTIES }}" | base64 -d > ~/.gradle/gradle.properties
- name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
gpg --pinentry-mode loopback --passphrase "${{ secrets.OSSRH_GPG_SECRET_PASSWORD }}" --export-secret-key 568FD16F857171A0EC6D2C40742C84722FD2B235 > ~/.gradle/maven-central.gpg
gpg --list-secret-keys --keyid-format LONG
- name: Check version
working-directory: .
run: ./.github/scripts/check_version.sh $(echo "${{ github.ref }}" | sed -e "s,^refs/tags/,,")
- name: Build and Publish
working-directory: .
run: |
./gradlew setVersion -P version=$(echo "${{ github.ref }}" | sed -e "s,^refs/tags/,,")
./gradlew build test release --info --stacktrace
3 changes: 0 additions & 3 deletions .github/workflows/java-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches:
- main
push:
branches:
- main

jobs:
java-test:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [2.0.2] - 2022-09-14
### CI
- Upgrade from JDK 8 to JDK 11 to fix the problem encountered by Spotless when formatting Kotlin.
- Restore release and publication tasks in maven central repository.
### Upgraded examples
- "Keyple Service Library" to version `2.1.0`
- "Keyple Service Resource Library" to version `2.0.2`
- "Keyple Card Calypso Library" to version `2.2.1`

## [2.0.1] - 2022-06-09
### Added
Expand All @@ -32,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.0.0] - 2020-12-18
This is the initial release.

[unreleased]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/compare/2.0.1...HEAD
[unreleased]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/compare/2.0.2...HEAD
[2.0.2]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/compare/2.0.1...2.0.2
[2.0.1]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/compare/2.0.0...2.0.1
[2.0.0]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/compare/1.0.0...2.0.0
[1.0.0]: https://github.com/calypsonet/keyple-plugin-cna-famoco-se-communication-java-lib/releases/tag/1.0.0
Expand Down
6 changes: 3 additions & 3 deletions example-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ dependencies {
implementation("org.calypsonet.terminal:calypsonet-terminal-calypso-java-api:1.2.+") { isChanging = true }
implementation("org.eclipse.keyple:keyple-plugin-android-nfc-java-lib:2.0.1")
implementation("org.eclipse.keyple:keyple-common-java-api:2.0.+") { isChanging = true }
implementation("org.eclipse.keyple:keyple-service-java-lib:2.1.0-SNAPSHOT") { isChanging = true }
implementation("org.eclipse.keyple:keyple-service-resource-java-lib:2.0.2-SNAPSHOT") { isChanging = true }
implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:2.2.0")
implementation("org.eclipse.keyple:keyple-service-java-lib:2.1.0")
implementation("org.eclipse.keyple:keyple-service-resource-java-lib:2.0.2")
implementation("org.eclipse.keyple:keyple-card-calypso-java-lib:2.2.1")
implementation("org.eclipse.keyple:keyple-util-java-lib:2.+") { isChanging = true }

/*
Expand Down
127 changes: 0 additions & 127 deletions famoco-plugin-mock/build.gradle.kts

This file was deleted.

Empty file.
2 changes: 0 additions & 2 deletions famoco-plugin-mock/gradle.properties

This file was deleted.

21 changes: 0 additions & 21 deletions famoco-plugin-mock/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion famoco-plugin-mock/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include(":example-app")
include(":famoco-plugin")
include(":famoco-plugin-mock")
rootProject.name = "keyple-plugin-cna-famoco-se-communication-java-lib"

// Fix resolution of dependencies with dynamic version in order to use SNAPSHOT first when available.
Expand Down

0 comments on commit 1bbb338

Please sign in to comment.