Update to Artifactory plugin v5 (#81)

Also update gradle to 8.5
wpilibsuite · Oct 13, 2024 · 93b0c3a · 93b0c3a
1 parent 096832d
commit 93b0c3a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/combiner/allwpilib/combine.gradle b/combiner/allwpilib/combine.gradle
@@ -28,7 +28,6 @@ if (System.getenv()['RUN_AZURE_ARTIFACTORY_RELEASE'] != null) {
         }
         username = System.getenv()['ARTIFACTORY_PUBLISH_USERNAME']
         password = System.getenv()['ARTIFACTORY_PUBLISH_PASSWORD']
-        maven = true
       }
     }
     clientConfig.info.setBuildName('allwpilib')

diff --git a/combiner/build.gradle b/combiner/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.jfrog.artifactory" version "4.29.3" apply false
+    id "com.jfrog.artifactory" version "5.2.5" apply false
 }
 
 ext.getClassifier = { f->
@@ -17,5 +17,5 @@ if (project.hasProperty('thirdparty')) {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.5'
 }
diff --git a/combiner/gradle/wrapper/gradle-wrapper.jar b/combiner/gradle/wrapper/gradle-wrapper.jar
diff --git a/combiner/gradle/wrapper/gradle-wrapper.properties b/combiner/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/combiner/thirdparty/combine.gradle b/combiner/thirdparty/combine.gradle
@@ -26,7 +26,6 @@ if (System.getenv()['RUN_AZURE_ARTIFACTORY_RELEASE'] != null) {
         repoKey = 'thirdparty-mvn-release'
         username = System.getenv()['ARTIFACTORY_PUBLISH_USERNAME']
         password = System.getenv()['ARTIFACTORY_PUBLISH_PASSWORD']
-        maven = true
       }
     }
     if (project.hasProperty('buildName')) {