diff --git a/.github/keys/deploy_key_rsa.gpg b/.github/keys/deploy_key_rsa.gpg new file mode 100644 index 0000000000..7f434966d6 Binary files /dev/null and b/.github/keys/deploy_key_rsa.gpg differ diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6cd876eeb2..6d737a4049 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,11 +28,22 @@ jobs: - name: Build with gradle run: ./gradlew build --stacktrace + - name: Ensure credential directory exists + run: mkdir -p $XDG_CONFIG_HOME/dart/ + - name: Decrypt Pub credentials run: ./script/decrypt.sh "$PUB_CREDENTIALS_KEY" ./.github/keys/pub-credentials.json.gpg $XDG_CONFIG_HOME/dart/pub-credentials.json shell: bash env: PUB_CREDENTIALS_KEY: ${{ secrets.PUB_CREDENTIALS_KEY }} + - name: Decrypt Git SSH credentials + run: ./script/decrypt.sh "$GIT_CREDENTIALS_KEY" ./.github/keys/deploy_key_rsa.gpg ./deploy_key_rsa + env: + GIT_CREDENTIALS_KEY: ${{ secrets.GIT_CREDENTIALS_KEY }} + - name: Publish to Pub - run: ./gradlew publish -x test --stacktrace \ No newline at end of file + run: ./gradlew publish -x test --stacktrace + env: + FORMAL_GIT_HUB_PAGES_AUTHOR: developers@spine.io + TRAVIS_REPO_SLUG: $GITHUB_REPOSITORY diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md index c84ab7c4bf..bb61e72294 100644 --- a/client/CHANGELOG.md +++ b/client/CHANGELOG.md @@ -61,3 +61,6 @@ ## 1.8.1 This release fixes the previously broken `dart_code_gen:1.8.0`. + +## 1.8.2 + This release removes web-based `firebase` implementation from the client. diff --git a/client/build.gradle.kts b/client/build.gradle.kts index ec93c2b2f1..10d2a53e14 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -67,7 +67,7 @@ tasks.assemble { val dartDocDir = Files.createTempDir() val dartDoc by tasks.creating(Exec::class) { - commandLine("dartdoc", "--output", dartDocDir.path, "$projectDir/lib/") + commandLine("dart", "doc", "--output", dartDocDir.path) } afterEvaluate { diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 4f15572c78..41743d9cd5 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -1,6 +1,6 @@ name: spine_client description: Dart-based library for client applications of Spine-based systems. -version: 1.8.1 +version: 1.8.2 homepage: https://spine.io environment: diff --git a/codegen/pubspec.yaml b/codegen/pubspec.yaml index 75acc741e2..08bd11348d 100644 --- a/codegen/pubspec.yaml +++ b/codegen/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_code_gen description: A command-line tool which generates Dart code for Protobuf type registries. -version: 1.8.1 +version: 1.8.2 homepage: https://spine.io environment: diff --git a/integration-tests/client-test/integration-test/client_test.dart b/integration-tests/client-test/integration-test/client_test.dart index ceea31b7d9..bad151620c 100644 --- a/integration-tests/client-test/integration-test/client_test.dart +++ b/integration-tests/client-test/integration-test/client_test.dart @@ -76,7 +76,7 @@ void main() { /// if they already create subscriptions, they are not likely to make a query as soon as /// an update occurs. /// - Future _sleep() => Future.delayed(Duration(seconds: 2)); + Future _sleep() => Future.delayed(Duration(seconds: 3)); test('send commands and obtain query data through Firebase RDB', () async { var taskId = TaskId()