Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
88f769d
Update config
dmdashenkov Nov 9, 2020
9f5a170
Update Spine versions
dmdashenkov Nov 9, 2020
a272c6a
Add `DartExtension`
dmdashenkov Nov 9, 2020
93ec7c0
Add `CODE_OF_CONDUCT.md` to git
dmdashenkov Nov 9, 2020
5557a90
Remove redundant config
dmdashenkov Nov 9, 2020
e2f1111
Add Gradle tasks to enhance generated Dart code
dmdashenkov Nov 10, 2020
01a0830
Add `LICENSE`
dmdashenkov Nov 12, 2020
4bb51fd
Add a test for `enableDart()`
dmdashenkov Nov 12, 2020
79eda9d
Use an abstract task instead of `Exec` and update a test
dmdashenkov Nov 13, 2020
c5b4351
Merge branch 'master' into bootstrap-dart
dmdashenkov Nov 13, 2020
9ffc487
Update report
dmdashenkov Nov 13, 2020
c978b5e
Use a real Project to check applied plugins instead of a fake
dmdashenkov Nov 13, 2020
432caa0
Optimize imports
dmdashenkov Nov 13, 2020
896d590
Add doc
dmdashenkov Nov 13, 2020
a575705
Use `PubCache` from `base`
dmdashenkov Nov 13, 2020
f6656e1
Extract tool name to a constant
dmdashenkov Nov 13, 2020
704dc8e
Remove verbose build logging
dmdashenkov Nov 16, 2020
7b8cdaa
Update use of `base`
dmdashenkov Nov 16, 2020
9a9364d
Fix an import
dmdashenkov Nov 16, 2020
27c5b6d
Update reports
dmdashenkov Nov 16, 2020
47b3ef8
Set up env for Dart on CI
dmdashenkov Nov 16, 2020
b4a6d7a
Fix Travis config
dmdashenkov Nov 16, 2020
3a1f4f8
Allow echoing commands for a CI script
dmdashenkov Nov 16, 2020
f27f3b0
Fix path to a script
dmdashenkov Nov 16, 2020
4c2a58a
Move `pub` command directly to `.travis.yml`
dmdashenkov Nov 16, 2020
90bedfc
Move Dart installation to `before_install`
dmdashenkov Nov 16, 2020
9e8500f
Add missing PATH element
dmdashenkov Nov 17, 2020
39be09c
Ensure `dart` is a plugin, not a `builtin`
dmdashenkov Nov 17, 2020
31fd5b9
Install `dart_code_gen` on CI
dmdashenkov Nov 17, 2020
999e05c
Use a script from `config` instead of a custom one
dmdashenkov Nov 17, 2020
8a7368f
More logging on Windows CI
dmdashenkov Nov 17, 2020
b58da67
Move Windows CI setup from file directly to 'win.yml'
dmdashenkov Nov 17, 2020
5ac8a48
Use the new `TempDir` util instead of JUnit's annotation
dmdashenkov Nov 17, 2020
28b0bfe
Remove verbose output
dmdashenkov Nov 17, 2020
fb7ff03
Remove empty line
dmdashenkov Nov 17, 2020
637c8f0
Use JUnit to create temp directories
dmdashenkov Nov 17, 2020
ddea4d9
Update Gradle
dmdashenkov Nov 17, 2020
4fcac21
Document a `Correspondence`
dmdashenkov Nov 17, 2020
50a43c8
Avoid JUnit and use a custom util to create temp directories
dmdashenkov Nov 17, 2020
9c84692
Add shutdown hooks for temp files
dmdashenkov Nov 17, 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
7 changes: 6 additions & 1 deletion .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@ jobs:
run: git submodule update --init --recursive

- name: Run tests with Gradle
run: gradlew.bat build
shell: cmd
run: >
choco install dart-sdk --limitoutput
&& refreshenv
&& pub global activate protoc_plugin
&& pub global activate dart_code_gen
&& gradlew.bat build
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ language: java
jdk:
- openjdk8

env:
global:
- PATH="$PATH:/usr/lib/dart/bin"

before_install:
- chmod +x ./gradlew
- chmod +x ./config/scripts/publish-artifacts.sh
- chmod +x ./config/scripts/update-apt.sh
- ./config/scripts/update-apt.sh
- sudo apt-get install dart
- pub global activate protoc_plugin
- pub global activate dart_code_gen

install:
- openssl aes-256-cbc -K $encrypted_484d6a99d515_key -iv $encrypted_484d6a99d515_iv -in credentials.tar.enc -out credentials.tar -d
Expand Down
65 changes: 0 additions & 65 deletions buildSrc/src/main/kotlin/func-test-env.gradle.kts

This file was deleted.

39 changes: 21 additions & 18 deletions buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -67,41 +67,41 @@ object Repos {
}

object Versions {
val checkerFramework = "3.3.0"
val errorProne = "2.3.4"
val checkerFramework = "3.7.1"
val errorProne = "2.4.0"
val errorProneJavac = "9+181-r4173-1" // taken from here: https://github.com/tbroyer/gradle-errorprone-plugin/blob/v0.8/build.gradle.kts
val errorPronePlugin = "1.2.1"
val errorPronePlugin = "1.3.0"
val pmd = "6.24.0"
val checkstyle = "8.29"
val protobufPlugin = "0.8.12"
val appengineApi = "1.9.79"
val protobufPlugin = "0.8.13"
val appengineApi = "1.9.82"
val appenginePlugin = "2.2.0"
val findBugs = "3.0.2"
val guava = "29.0-jre"
val protobuf = "3.11.4"
val guava = "30.0-jre"
val protobuf = "3.13.0"
val grpc = "1.28.1"
val flogger = "0.5.1"
val junit4 = "4.12"
val junit5 = "5.6.2"
val junitPlatform = "1.6.2"
val junitPioneer = "0.4.2"
val truth = "1.0.1"
val junit4 = "4.13.1"
val junit5 = "5.7.0"
val junitPlatform = "1.7.0"
val junitPioneer = "1.0.0"
val truth = "1.1"
val httpClient = "1.34.2"
val apacheHttpClient = "2.1.2"
val firebaseAdmin = "6.12.2"
val roaster = "2.21.2.Final"
val licensePlugin = "1.13"
val javaPoet = "1.12.1"
val autoService = "1.0-rc6"
val javaPoet = "1.13.0"
val autoService = "1.0-rc7"
val autoCommon = "0.10"
val jackson = "2.9.10.5"
val animalSniffer = "1.18"
val animalSniffer = "1.19"
val apiguardian = "1.1.0"
val javaxAnnotation = "1.3.2"
val klaxon = "5.4"
val ouathJwt = "3.10.3"
val ouathJwt = "3.11.0"
val bouncyCastlePkcs = "1.66"
val assertK = "0.22"
val assertK = "0.23"

/**
* Version of the SLF4J library.
Expand All @@ -113,7 +113,7 @@ object Versions {
* this version and force it via [forceConfiguration(..)][DependencyResolution.forceConfiguration].
*/
@Deprecated("Use Flogger over SLF4J.", replaceWith = ReplaceWith("flogger"))
val slf4j = "1.7.29"
val slf4j = "1.7.30"
}

object GradlePlugins {
Expand Down Expand Up @@ -312,6 +312,9 @@ object DependencyResolution {
Deps.test.junit4,

// Transitive dependencies of 3rd party components that we don't use directly.
"org.junit.platform:junit-platform-commons:${Versions.junitPlatform}",
"com.google.auto.value:auto-value-annotations:1.7.4",
"com.google.auto.service:auto-service-annotations:1.0-rc7",
"com.google.code.gson:gson:2.8.6",
"com.google.j2objc:j2objc-annotations:1.3",
"org.codehaus.plexus:plexus-utils:3.3.0",
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@
#

org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=1024m
org.gradle.logging.level=info
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading