From afdef36973811444af89293eb0a2285366458652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:39:51 +0000 Subject: [PATCH 1/6] Bump com.fizzpod:gradle-plugin-opinion from 16.0.0 to 16.0.5 Bumps com.fizzpod:gradle-plugin-opinion from 16.0.0 to 16.0.5. --- updated-dependencies: - dependency-name: com.fizzpod:gradle-plugin-opinion dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6bbcb8e..940afbf 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath ('com.fizzpod:gradle-plugin-opinion:16.0.0') { + classpath ('com.fizzpod:gradle-plugin-opinion:16.0.5') { exclude group: 'com.fizzpod', module: 'gradle-extended-info-plugin' } } From 1cd663beb53da810558fe8a7cd9a4a3f188708b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:39:53 +0000 Subject: [PATCH 2/6] Bump com.gradle.enterprise from 3.1 to 3.13.3 Bumps com.gradle.enterprise from 3.1 to 3.13.3. --- updated-dependencies: - dependency-name: com.gradle.enterprise dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 2e10f3b..df907f5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ include 'services:webservice' */ plugins { - id "com.gradle.enterprise" version "3.1" + id "com.gradle.enterprise" version "3.13.3" } From 9d10ae037adf22f8731138650b19ef68d2feee8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:39:57 +0000 Subject: [PATCH 3/6] Bump com.netflix.nebula:gradle-info-plugin from 12.1.0 to 12.1.4 Bumps [com.netflix.nebula:gradle-info-plugin](https://github.com/nebula-plugins/gradle-info-plugin) from 12.1.0 to 12.1.4. - [Release notes](https://github.com/nebula-plugins/gradle-info-plugin/releases) - [Changelog](https://github.com/nebula-plugins/gradle-info-plugin/blob/main/CHANGELOG.md) - [Commits](https://github.com/nebula-plugins/gradle-info-plugin/compare/v12.1.0...v12.1.4) --- updated-dependencies: - dependency-name: com.netflix.nebula:gradle-info-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildSrc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 127acdd..812bd52 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -3,7 +3,7 @@ repositories { } dependencies { - implementation 'com.netflix.nebula:gradle-info-plugin:12.1.0' + implementation 'com.netflix.nebula:gradle-info-plugin:12.1.4' testImplementation 'com.netflix.nebula:nebula-test:10.3.0' constraints { implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8') { From 9f3038cd9b824cd45d7921b7d50c47f566745194 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 21:40:01 +0000 Subject: [PATCH 4/6] Bump com.netflix.nebula:nebula-test from 10.3.0 to 10.5.0 Bumps [com.netflix.nebula:nebula-test](https://github.com/nebula-plugins/nebula-test) from 10.3.0 to 10.5.0. - [Release notes](https://github.com/nebula-plugins/nebula-test/releases) - [Changelog](https://github.com/nebula-plugins/nebula-test/blob/main/CHANGELOG.md) - [Commits](https://github.com/nebula-plugins/nebula-test/compare/v10.3.0...v10.5.0) --- updated-dependencies: - dependency-name: com.netflix.nebula:nebula-test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildSrc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 127acdd..6297883 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,7 +4,7 @@ repositories { dependencies { implementation 'com.netflix.nebula:gradle-info-plugin:12.1.0' - testImplementation 'com.netflix.nebula:nebula-test:10.3.0' + testImplementation 'com.netflix.nebula:nebula-test:10.5.0' constraints { implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8') { because 'version 1.3.5 as defined by nebula gradle-info-plugin has a known vulnerability' From 82fca009bca88168bbd93b527a4c4f1094ce72dd Mon Sep 17 00:00:00 2001 From: boxheed Date: Mon, 29 May 2023 22:51:39 +0100 Subject: [PATCH 5/6] removed deepsource config --- .deepsource.toml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml deleted file mode 100644 index 01ee279..0000000 --- a/.deepsource.toml +++ /dev/null @@ -1,10 +0,0 @@ -version = 1 - -[[analyzers]] -name = "java" - - [analyzers.meta] - runtime_version = "11" - -[[transformers]] -name = "google-java-format" \ No newline at end of file From 362807022a3327c2ffc3395c3f3bd3147aa098c8 Mon Sep 17 00:00:00 2001 From: boxheed Date: Tue, 13 Jun 2023 22:32:18 +0100 Subject: [PATCH 6/6] Updated to new build configuration --- .circleci/config.yml | 34 ++++++++++++++++++++++++++++------ build.gradle | 2 +- settings.gradle | 2 ++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d98c89c..ceff20a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,6 +37,23 @@ jobs: - checkout - run: ./gradlew clean dependencyCheckAnalyze + release: + docker: + # specify the version you desire here + - image: cimg/openjdk:11.0 + working_directory: ~/repo + environment: + # Customize the JVM maximum heap limit + JVM_OPTS: -Xmx3200m + TERM: dumb + steps: + - run: + name: setup + command: source <(curl -s https://raw.githubusercontent.com/boxheed/shippable-scripts/master/java-build-ci-setup) + - checkout + - run: ./gradlew createRelease + - run: git push --tags + publish: docker: # specify the version you desire here @@ -51,10 +68,7 @@ jobs: name: setup command: source <(curl -s https://raw.githubusercontent.com/boxheed/shippable-scripts/master/java-build-ci-setup) - checkout - - run: ./gradlew clean verifyRelease createRelease - - run: ./gradlew clean build - - run: ./gradlew publish - - run: ./gradlew publishPlugins + - run: ./gradlew build publish publishPlugins githubRelease workflows: build: @@ -68,10 +82,18 @@ workflows: filters: branches: only: /^release.*$/ - - publish: + - release: context: boxhead-builds requires: - build filters: branches: - only: master \ No newline at end of file + only: /^(?:main|master)$/ + - publish: + context: boxhead-builds + filters: + # only act on version tags + branches: + ignore: /.*/ + tags: + only: /^release-\d+\.\d+\.\d+$/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 940afbf..fecf77f 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath ('com.fizzpod:gradle-plugin-opinion:16.0.5') { + classpath ('com.fizzpod:gradle-plugin-opinion:16.1.1') { exclude group: 'com.fizzpod', module: 'gradle-extended-info-plugin' } } diff --git a/settings.gradle b/settings.gradle index df907f5..e330684 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,7 +18,9 @@ include 'services:webservice' plugins { id "com.gradle.enterprise" version "3.13.3" + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } + rootProject.name = 'gradle-extended-info-plugin'