Merge pull request #16 from boxheed/develop

Updated build configuration and dependencies
boxheed · Jun 13, 2023 · 7cd3665 · 7cd3665
2 parents 895dd6a + 3628070
commit 7cd3665
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 20 deletions.
diff --git 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
+              only: /^(?:main|master)$/
+      - publish:
+          context: boxhead-builds
+          filters:
+            # only act on version tags
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^release-\d+\.\d+\.\d+$/
diff --git a/.deepsource.toml b/.deepsource.toml
diff --git 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.1.1') {
       exclude group: 'com.fizzpod', module: 'gradle-extended-info-plugin'
     }
   }

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -3,8 +3,8 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.netflix.nebula:gradle-info-plugin:12.1.0'
-  testImplementation 'com.netflix.nebula:nebula-test:10.3.0'
+  implementation 'com.netflix.nebula:gradle-info-plugin:12.1.4'
+  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'

diff --git a/settings.gradle b/settings.gradle
@@ -17,8 +17,10 @@ include 'services:webservice'
 */
 
 plugins {
-  id "com.gradle.enterprise" version "3.1"
+  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'