Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .github/keys/cloudrepo.properties.gpg
Binary file not shown.
Binary file added .github/keys/deploy_key_rsa.gpg
Binary file not shown.
Binary file added .github/keys/firebase-sa.json.gpg
Binary file not shown.
Binary file added .github/keys/gcs-auth-key.json.gpg
Binary file not shown.
2 changes: 2 additions & 0 deletions .github/keys/gradle-plugin-portal.secret.properties.gpg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
� 2�.y�:���ҢF����`�J�1$�����9�������� D~�z�e��!yu��GBU��2�K�0�!�� ����q =���˂p�������@z����e�qB�>�R#�qj�?�1��m굘U��^�2��*���k��J� 3�w�q84}.
�2��M<�
Expand Down
Binary file added .github/keys/maven-publisher.json.gpg
Binary file not shown.
70 changes: 70 additions & 0 deletions .github/workflows/publish-v1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Publishing for Spine v1.x

on:
push:
branches:
- v1
- 1.x-dev

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: 'true'

- uses: actions/setup-java@v3
with:
java-version: 8
distribution: zulu
cache: gradle

- name: Decrypt CloudRepo credentials
run: ./config/scripts/decrypt.sh "$CLOUDREPO_CREDENTIALS_KEY" ./.github/keys/cloudrepo.properties.gpg ./cloudrepo.properties
env:
CLOUDREPO_CREDENTIALS_KEY: ${{ secrets.CLOUDREPO_CREDENTIALS_KEY }}

- name: Decrypt Git SSH credentials
run: ./config/scripts/decrypt.sh "$GIT_CREDENTIALS_KEY" ./.github/keys/deploy_key_rsa.gpg ./deploy_key_rsa
env:
GIT_CREDENTIALS_KEY: ${{ secrets.GIT_CREDENTIALS_KEY }}

# Make sure the SSH key is not "too visible". SSH agent will not accept it otherwise.
- name: Set file system permissions
run: chmod 400 ./deploy_key_rsa && chmod +x ./config/scripts/register-ssh-key.sh

- name: Decrypt GCS credentials
run: ./config/scripts/decrypt.sh "$GCS_CREDENTIALS_KEY" ./.github/keys/gcs-auth-key.json.gpg ./gcs-auth-key.json
env:
GCS_CREDENTIALS_KEY: ${{ secrets.GCS_CREDENTIALS_KEY }}

- name: Decrypt GCAR credentials
run: ./config/scripts/decrypt.sh "$MAVEN_PUBLISHER_KEY" ./.github/keys/maven-publisher.json.gpg ./maven-publisher.json
env:
MAVEN_PUBLISHER_KEY: ${{ secrets.MAVEN_PUBLISHER_KEY }}

- name: Decrypt Git SSH credentials
run: ./config/scripts/decrypt.sh "$GRADLE_PORTAL_CREDENTIALS_KEY" ./.github/keys/gradle-plugin-portal.secret.properties.gpg ./gradle-plugin-portal.secret.properties
env:
GRADLE_PORTAL_CREDENTIALS_KEY: ${{ secrets.GRADLE_PORTAL_CREDENTIALS_KEY }}

- name: Append Gradle properties
run: cat ./gradle-plugin-portal.secret.properties >> ./gradle.properties

- name: Publish artifacts to Maven
# Since we're in the `v1`/`1.x-dev` branch already, this means that tests of a PR passed.
# So, no need to run the tests again when publishing.\
#
# Also, we don't want to update the GitHub Pages content, as it may be already
# updated with the contents of 2.x branch. So this operation should be performed
# manually, if really needed.
# See https://github.com/SpineEventEngine/config/tree/master/scripts/publish-documentation.
run: ./gradlew publish -x test -x updateGitHubPages --stacktrace
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FORMAL_GIT_HUB_PAGES_AUTHOR: developers@spine.io
# https://docs.github.com/en/actions/reference/environment-variables
REPO_SLUG: $GITHUB_REPOSITORY # e.g. SpineEventEngine/core-java
GOOGLE_APPLICATION_CREDENTIALS: ./maven-publisher.json
NPM_TOKEN: ${{ secrets.NPM_SECRET }}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ plugins {

repositories {
mavenLocal()
jcenter()
mavenCentral()
}

val jacksonVersion = "2.11.0"
Expand Down
10 changes: 9 additions & 1 deletion buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,15 @@ object DependencyResolution {
includeGroup("io.spine.gcloud")
}
}
repositories.jcenter()
repositories.maven {
url = URI(Repos.spineSnapshots)
content {
includeGroup("io.spine")
includeGroup("io.spine.tools")
includeGroup("io.spine.gcloud")
}
}
repositories.mavenCentral()
repositories.maven {
url = URI(Repos.gradlePlugins)
}
Expand Down
2 changes: 1 addition & 1 deletion config
Submodule config updated 51 files
+ .github-workflows/keys/cloudrepo.properties.gpg
+ .github-workflows/keys/deploy_key_rsa.gpg
+ .github-workflows/keys/firebase-sa.json.gpg
+ .github-workflows/keys/gcs-auth-key.json.gpg
+2 −0 .github-workflows/keys/gradle-plugin-portal.secret.properties.gpg
+ .github-workflows/keys/maven-publisher.json.gpg
+70 −0 .github-workflows/publish-v1.yml
+1 −1 .gitignore
+1 −1 gcs.properties
+2 −2 gradle/buildSrc/build.gradle.kts
+1 −1 gradle/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt
+1 −1 gradle/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
+1 −1 gradle/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt
+10 −2 gradle/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
+5 −2 gradle/checkstyle.gradle
+1 −1 gradle/dart/build-tasks.gradle
+1 −1 gradle/dart/pub-publish-tasks.gradle
+2 −2 gradle/dependencies.gradle
+1 −1 gradle/filter-internal-javadoc.gradle
+24 −12 gradle/generate-pom.gradle
+2 −2 gradle/jacoco.gradle
+1 −1 gradle/javac-args.gradle
+1 −1 gradle/javadoc-options.gradle
+1 −1 gradle/js/build-tasks.gradle
+1 −1 gradle/js/configure-proto.gradle
+1 −1 gradle/js/npm-cli.gradle
+1 −1 gradle/js/npm-publish-tasks.gradle
+1 −1 gradle/js/update-package-version.gradle
+1 −1 gradle/license-report-common.gradle
+1 −1 gradle/license-report-project.gradle
+1 −1 gradle/license-report-repo.gradle
+1 −1 gradle/model-compiler.gradle
+1 −1 gradle/pmd.gradle
+2 −2 gradle/publish-proto.gradle
+3 −2 gradle/publish.gradle
+1 −1 gradle/run-build.gradle
+1 −1 gradle/slow-tests.gradle
+1 −1 gradle/test-artifacts.gradle
+1 −1 gradle/test-output.gradle
+2 −2 gradle/update-gh-pages.gradle
+3 −3 pull
+1 −1 quality/checkstyle-suppressions.xml
+2 −2 quality/checkstyle.xml
+1 −1 quality/pmd.xml
+42 −0 scripts/decrypt.sh
+1 −1 scripts/publish-artifacts.sh
+1 −1 scripts/register-ssh-key.sh
+1 −1 scripts/trigger-publishing.sh
+1 −1 scripts/update-apt.sh
+1 −1 scripts/upload-artifacts.sh
+1 −1 scripts/util/remove_finals.py
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
kotlin.code.style=official
org.gradle.jvmargs=-Xmx1g -Xms256m -XX:MaxMetaspaceSize=512m -XX:+UseParallelGC
32 changes: 16 additions & 16 deletions license-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


# Dependencies of `io.spine:spine-client:1.8.2`
# Dependencies of `io.spine:spine-client:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -399,12 +399,12 @@
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:11 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:22 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine:spine-core:1.8.2`
# Dependencies of `io.spine:spine-core:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -763,12 +763,12 @@ This report was generated on **Wed Jun 22 19:47:11 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:12 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:23 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:spine-model-assembler:1.8.2`
# Dependencies of `io.spine.tools:spine-model-assembler:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -1162,12 +1162,12 @@ This report was generated on **Wed Jun 22 19:47:12 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:12 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:24 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:spine-model-verifier:1.8.2`
# Dependencies of `io.spine.tools:spine-model-verifier:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -1627,12 +1627,12 @@ This report was generated on **Wed Jun 22 19:47:12 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:13 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:26 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine:spine-server:1.8.2`
# Dependencies of `io.spine:spine-server:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -2039,12 +2039,12 @@ This report was generated on **Wed Jun 22 19:47:13 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:13 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:27 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine:spine-testutil-client:1.8.2`
# Dependencies of `io.spine:spine-testutil-client:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -2493,12 +2493,12 @@ This report was generated on **Wed Jun 22 19:47:13 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:15 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:30 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine:spine-testutil-core:1.8.2`
# Dependencies of `io.spine:spine-testutil-core:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -2947,12 +2947,12 @@ This report was generated on **Wed Jun 22 19:47:15 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:16 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:32 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine:spine-testutil-server:1.8.2`
# Dependencies of `io.spine:spine-testutil-server:1.9.0-SNAPSHOT.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -3445,4 +3445,4 @@ This report was generated on **Wed Jun 22 19:47:16 EEST 2022** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Wed Jun 22 19:47:19 EEST 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Wed Nov 09 14:52:39 TRT 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
46 changes: 35 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.

<groupId>io.spine</groupId>
<artifactId>spine-core-java</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -52,25 +52,25 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-base</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-time</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-model-compiler</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-plugin-base</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -124,25 +124,25 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-testlib</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-testutil-time</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-mute-logging</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-plugin-testlib</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -169,11 +169,29 @@ all modules and does not describe the project structure per-subproject.
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_type_annotations</artifactId>
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>javac</artifactId>
Expand All @@ -192,18 +210,24 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-javadoc-filter</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-protoc-plugin</artifactId>
<version>1.8.2</version>
<version>1.9.0-SNAPSHOT.5</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>6.24.0</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.7.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pull
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#

cd ./config || exit
echo "Switching the pointer of the 'config' submodule to its 'master'."
git checkout master
echo "Switching the pointer of the 'config' submodule to its 'v1.x'."
git checkout v1.x
git pull

cd ..
Expand Down
Loading