Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup dependencies #155

Merged
merged 35 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cbec1d0
Drop obsolete App Engine API dependency.
yuri-sergiichuk Oct 9, 2020
f5a8324
Bump versions
yuri-sergiichuk Oct 9, 2020
95396bd
Use latest execfork plugin.
yuri-sergiichuk Nov 5, 2020
c77ad45
Use latest Gretty plugin.
yuri-sergiichuk Nov 5, 2020
c1d8ed6
Upgradle v6.7
yuri-sergiichuk Nov 5, 2020
9edad14
Update config.
yuri-sergiichuk Nov 5, 2020
e1a44ab
Do not use deprecated `file(String)` API.
yuri-sergiichuk Nov 5, 2020
cf6b729
Bump JS version.
yuri-sergiichuk Nov 5, 2020
17ee9f2
Cleanup docs and specify NodeJs version.
yuri-sergiichuk Nov 5, 2020
32c5d24
Specify NodeJs version in NVM rc configuration file.
yuri-sergiichuk Nov 5, 2020
fb0e6df
Specify NodeJs and NPM versions in the package.json
yuri-sergiichuk Nov 5, 2020
2923341
Use v12 NodeJs LTS version.
yuri-sergiichuk Nov 5, 2020
cb06119
Specify engines in the tests as well. Bump version.
yuri-sergiichuk Nov 5, 2020
b07eba2
Use latest Jetty 9.X version to be compatible with App Engine env.
yuri-sergiichuk Nov 5, 2020
6f281e3
Update reports.
yuri-sergiichuk Nov 5, 2020
67913d3
Update Git ignore config.
yuri-sergiichuk Nov 5, 2020
aafe9f4
Fix indentation.
yuri-sergiichuk Nov 5, 2020
af56aac
Bump dependencies.
yuri-sergiichuk Nov 5, 2020
14195a8
Fix UUID import and drop deprecated `assert.equals` usage.
yuri-sergiichuk Nov 5, 2020
b29dc39
Declare type of the `ANONYMOUS` actor to enable type-hinting.
yuri-sergiichuk Nov 5, 2020
1b34acf
Add Webpack test configuration that allows resolving aliases while wo…
yuri-sergiichuk Nov 5, 2020
3d206f6
Fix tests.
yuri-sergiichuk Nov 5, 2020
c44e72c
Compare same types while using `strictEquals`.
yuri-sergiichuk Nov 5, 2020
76d064c
Add webpack-test configuration for integration tests module.
yuri-sergiichuk Nov 5, 2020
f9032f7
To test same value types.
yuri-sergiichuk Nov 5, 2020
99c0460
Improve imports.
yuri-sergiichuk Nov 5, 2020
5cef599
Add `errors` test.
yuri-sergiichuk Nov 5, 2020
cd0b32d
Do not use `instancesof` for Proto messages that may be transferred o…
yuri-sergiichuk Nov 5, 2020
d6a3041
Update report.
yuri-sergiichuk Nov 5, 2020
38aa3ee
Add missing EOL.
yuri-sergiichuk Nov 5, 2020
eba05f9
Remove article
yuri-sergiichuk Nov 5, 2020
f2bcce5
Fix test
yuri-sergiichuk Nov 5, 2020
5ba0bc4
Use `npx` when running locally-installed tooling.
yuri-sergiichuk Nov 5, 2020
cd5f5c1
Rename `initSpineWeb` to `initSpineWebClient`.
yuri-sergiichuk Nov 6, 2020
9936e55
Rename `uuidv4` into `newUuid`.
yuri-sergiichuk Nov 6, 2020
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
46 changes: 41 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,47 @@
#
# Copyright 2020, TeamDev. All rights reserved.
#
# Redistribution and use in source and/or binary forms, with or without
# modification, must retain the above copyright notice and the following
# disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

#
# This file is used for two purposes:
# 1. ignoring files in the `config` project.
# 2. ignoring files in the projects that import `config` as a sub-module.
#
# Therefore, instructions below are superset of instructions required for all the projects.

# IntelliJ IDEA modules and interim config files.
*.iml
.idea/*.xml
.idea/.name
.idea/artifacts
.idea/libraries
.idea/modules
.idea/shelf
.idea/artifacts
.idea/*.xml

# Do not ignore the following IDEA settings
!/.idea/codeStyleSettings.xml
!.idea/misc.xml
!.idea/codeStyleSettings.xml
!.idea/codeStyles/
!.idea/copyright/

# Gradle interim configs
.gradle/**
**/.gradle/**

# Generated source code
**/generated/**
Expand All @@ -20,6 +52,9 @@
# Build files produced by the IDE
**/out/**

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

Expand All @@ -35,7 +70,8 @@
# Spine model compiler auto-generated resources
/tools/gradle-plugins/model-compiler/src/main/resources/spine-protoc.gradle

# Prevent accidental adding of credential files
# Login details to Maven repository.
# Each workstation should have developer's login defined in this file.
credentials.tar
credentials.properties
cloudrepo.properties
Expand Down
18 changes: 18 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
- secure: kvg85udsH9a515YPHTh87LfyZhkL41HSvz4x+Q2OPoB9R3Irf+6HuaQCWSNNfPXIeqQefK+WuEG/kDBPOmm/JO7jVzMnt3p3mroDIYxod1uyea1sVlM+Jv23qe9J1txh0YsI9s0mrOJy/7X3IGBwpiGZGSM54J4l/mMheIG1GCmXp9abrkkkzzXKD8cn6p2P4/qoDF65SIe+GgHmhHJjxOCioIEwTlHd5UQxzkomCKMxPIzh15f4CppVbpVDSELcl8F9PLiS3zH3YOiBITMVA5IW6DHMbzipMQzBAzzAAFLnmkt30apqandsZzlIHJFKzNdlZrWcIrsiWTEqy9kYuvr6bszWtRjdDDu/GpaVytTlXquYE3u8vlpK5ngR0w2CTu0RQRPWli4zJ/bH81Ps9eNa8LVRTr3Og2ebUoibWk5YKksxSOedBUPu4HXs/v2CPxBfLwPnKd1OKgZK7O5/NtDHeoJLp+0jSXp6GpTybYY3WesB4YAz++DXGkcYha0isUvtM3LuDiHduFvWlB3JMgsq0MJ5WiWZMTDxJsXhK8tQvRfKxvkBiiigHQ5PvumOva/7xzy8GoZybQrh5m6j8SJcdNcbabLrkCl0yv0fMgrF5+aIhNMAU04FruSKH5k59SqKQwuyi7++Om8/NEuJfzZJ2YtF5AHwlIXv5gyygOk=
- FORMAL_GIT_HUB_PAGES_AUTHOR: "spine-developers@teamdev.com"
# LTS version of Node.
- NODE_VERSION="12.8.1"
- NODE_VERSION="12.19.0"

before_install:
- chmod +x gradlew
Expand Down
128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
developers@spine.io.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
37 changes: 37 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
How to contribute
==================
Thank you for wanting to contribute to Spine. The following links will help you get started:
* [Wiki home][wiki-home] — the home of the framework developer's documentation.
* [Getting started with Spine in Java][quick-start] — this guide will walk you through
a minimal client-server “Hello World!” application in Java.
* [Introduction][docs-intro] — this section of the Spine Documentation will help you understand
the foundation of the framework.

Pull requests
-------------
The work on an improvement starts with creating an issue that describes a bug or a feature. The issue will be used for communications on the proposed improvements.
If code changes are going to be introduced, the issue should also have a link to the corresponding Pull Request.

Code contributions should:
* Be accompanied by tests.
* Be licensed under the Apache v2.0 license with the appropriate copyright header for each file.
* Formatted according to the code style. See [Wiki home][wiki-home] for the links to
style guides of the programming languages used in the framework.

Contributor License Agreement
-----------------------------
Contributions to the code of Spine Event Engine framework and its libraries must be accompanied by
Contributor License Agreement (CLA).

* If you are an individual writing original source code and you're sure you own
the intellectual property, then you'll need to sign an individual CLA.

* If you work for a company which wants you to contribute your work,
then an authorized person from your company will need to sign a corporate CLA.

Please [contact us][legal-email] for arranging the paper formalities.

[wiki-home]: https://github.com/SpineEventEngine/SpineEventEngine.github.io/wiki
[quick-start]: https://spine.io/docs/quick-start
[docs-intro]: https://spine.io/docs/introduction
[legal-email]: mailto:legal@teamdev.com
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,41 @@ class IncrementGuard : Plugin<Project> {
const val taskName = "checkVersionIncrement"
}

/**
* Adds the [CheckVersionIncrement] task to the project.
*
* Only adds the check if the project is built on Travis CI and the job is a pull request.
*
* The task will never run outside of Travis CI or when building individual branches. This is
* done to prevent unexpected CI fails when re-building `master` multiple times, creating git
* tags, and in other cases that go outside of the "usual" development cycle.
*/
override fun apply(target: Project) {
val tasks = target.tasks
tasks.register(taskName, CheckVersionIncrement::class.java) {
repository = PublishingRepos.cloudRepo
tasks.getByName("check").dependsOn(this)

shouldRunAfter("test")
if (!isTravisPullRequest()) {
logger.info("The build does not represent a Travis pull request job, the " +
"`checkVersionIncrement` task is disabled.")
this.enabled = false
}
}
}

/**
* Returns `true` if the current build is a Travis job which represents a GitHub pull request.
*
* Implementation note: the `TRAVIS_PULL_REQUEST` environment variable contains the pull
* request number rather than `"true"` in positive case, hence the check.
*
* @see <a href="https://docs.travis-ci.com/user/environment-variables/#default-environment-variables">
* List of default environment variables provided for Travis builds</a>
*/
private fun isTravisPullRequest(): Boolean {
val isPullRequest = System.getenv("TRAVIS_PULL_REQUEST")
return isPullRequest != null && isPullRequest != "false"
}
}
14 changes: 13 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 @@ -98,6 +98,10 @@ object Versions {
val animalSniffer = "1.18"
val apiguardian = "1.1.0"
val javaxAnnotation = "1.3.2"
val klaxon = "5.4"
val ouathJwt = "3.10.3"
val bouncyCastlePkcs = "1.66"
val assertK = "0.22"

/**
* Version of the SLF4J library.
Expand Down Expand Up @@ -159,7 +163,7 @@ object Build {

object AutoService {
val annotations = "com.google.auto.service:auto-service-annotations:${Versions.autoService}"
val processor = "com.google.auto.service:auto-service:${Versions.autoService}"
val processor = "com.google.auto.service:auto-service:${Versions.autoService}"
}
}

Expand All @@ -168,6 +172,13 @@ object Gen {
val javaxAnnotation = "javax.annotation:javax.annotation-api:${Versions.javaxAnnotation}"
}

object Publishing {
val klaxon = "com.beust:klaxon:${Versions.klaxon}"
val oauthJwt = "com.auth0:java-jwt:${Versions.ouathJwt}"
val bouncyCastlePkcs = "org.bouncycastle:bcpkix-jdk15on:${Versions.bouncyCastlePkcs}"
val assertK = "com.willowtreeapps.assertk:assertk-jvm:${Versions.assertK}"
}

object Grpc {
val core = "io.grpc:grpc-core:${Versions.grpc}"
val stub = "io.grpc:grpc-stub:${Versions.grpc}"
Expand Down Expand Up @@ -275,6 +286,7 @@ object Deps {
val test = Test
val versions = Versions
val scripts = Scripts
val publishing = Publishing
}

object DependencyResolution {
Expand Down
1 change: 1 addition & 0 deletions client-js/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12.19.0
Loading