Skip to content

Commit

Permalink
Merge pull request #118 from RedPillAnalytics/develop
Browse files Browse the repository at this point in the history
Bumped dependencies
  • Loading branch information
stewartbryson committed Apr 15, 2022
2 parents 3b58a2a + 7bc1a45 commit c14d22a
Show file tree
Hide file tree
Showing 8 changed files with 172 additions and 121 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id 'groovy'
id 'java-gradle-plugin'
id "com.gradle.plugin-publish" version "0.16.0"
id "com.gradle.plugin-publish" version "0.21.0"
id "com.github.breadmoirai.github-release" version "2.2.12"
id 'org.unbroken-dome.test-sets' version '4.0.0'
id "com.avast.gradle.docker-compose" version "0.14.9"
id "com.github.ben-manes.versions" version "0.39.0"
id "com.redpillanalytics.gradle-analytics" version "1.4.3"
id 'com.adarshr.test-logger' version '3.0.0'
id "com.avast.gradle.docker-compose" version "0.15.2"
id "com.github.ben-manes.versions" version "0.42.0"
id "com.redpillanalytics.gradle-analytics" version "1.4.6"
id 'com.adarshr.test-logger' version '3.2.0'
id 'build-dashboard'
}

Expand All @@ -31,18 +31,18 @@ githubRelease {
}

dependencies {
implementation 'org.codehaus.groovy:groovy:3.0.9'
implementation 'com.konghq:unirest-java:3.11.11'
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'org.codehaus.groovy:groovy:3.0.10'
implementation 'com.konghq:unirest-java:3.13.8'
implementation 'com.google.code.gson:gson:2.9.0'

// Gradle Properties
// It also has the Common library in it, thus the dependency here
implementation 'gradle.plugin.com.redpillanalytics:gradle-properties:1.0.2'
implementation 'gradle.plugin.com.redpillanalytics:gradle-properties:1.0.7'

// testing
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
testImplementation "org.testcontainers:spock:1.16.0"
testImplementation "org.testcontainers:kafka:1.16.0"
testImplementation "org.testcontainers:spock:1.17.1"
testImplementation "org.testcontainers:kafka:1.17.1"
}

// Default artifact naming.
Expand Down
6 changes: 3 additions & 3 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ steps:
args:
- '-cx'
- |
./gradlew --build-cache cleanLibs build groovydoc runAllTests buildDashboard
./gradlew cleanLibs build groovydoc runAllTests buildDashboard
env:
- 'PROJECT_ID=$PROJECT_ID'
waitFor:
Expand All @@ -35,7 +35,7 @@ steps:
- |
if [ $BRANCH_NAME == "master" ]
then
./gradlew --build-cache publish -Pgradle.publish.key=$${GRADLE_KEY} -Pgradle.publish.secret=$${GRADLE_SECRET}
./gradlew publish -Pgradle.publish.key=$${GRADLE_KEY} -Pgradle.publish.secret=$${GRADLE_SECRET}
fi
waitFor:
- test
Expand Down Expand Up @@ -74,7 +74,7 @@ options:
- GRADLE_USER_HOME=.gradle
- GRADLE_OPTS="-Dorg.gradle.daemon=false"
- ORG_GRADLE_PROJECT_analytics_buildTag=$BUILD_ID
- CI="Google Cloud Build"
- CI=true
secretEnv:
- GITHUB_TOKEN
- AWS_ACCESS_KEY_ID
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
githubToken = hidden
analyticsVersion = 1.4.3
analyticsVersion = 1.4.6
version = 1.0.0
org.gradle.caching=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit c14d22a

Please sign in to comment.