chore(build): gradle 6.5 (#871)

spinnaker · Jun 24, 2020 · 8bf1d59 · 8bf1d59
1 parent 5311ea5
commit 8bf1d59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/front50-web/front50-web.gradle b/front50-web/front50-web.gradle
@@ -17,7 +17,7 @@
 apply plugin: 'io.spinnaker.package'
 
 ext {
-  springConfigLocation = System.getProperty('spring.config.additional-location', "${System.getProperty('user.home')}/.spinnaker/")
+  springConfigLocation = System.getProperty('spring.config.additional-location', "${System.getProperty('user.home')}/.spinnaker/".toString())
 }
 
 run {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -22,6 +22,8 @@
   }
 }
 
+enableFeaturePreview("VERSION_ORDERING_V2")
+
 rootProject.name = "front50"
 
 include 'front50-web',