Publish 8.8-20240515011607+0000 (#29148)

gradle · May 15, 2024 · ee5dd75 · ee5dd75
2 parents b05b71a + cab5d8a
commit ee5dd75
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/...vy/org/gradle/configurationcache/ConfigurationCacheGradlePropertiesIntegrationTest.groovy b/...vy/org/gradle/configurationcache/ConfigurationCacheGradlePropertiesIntegrationTest.groovy
@@ -18,13 +18,11 @@ package org.gradle.configurationcache
 
 import org.gradle.configurationcache.fixtures.GradlePropertiesIncludedBuildFixture
 import org.gradle.configurationcache.fixtures.SystemPropertiesCompositeBuildFixture
-import org.gradle.test.fixtures.Flaky
 import spock.lang.Issue
 
 import static org.gradle.initialization.IGradlePropertiesLoader.ENV_PROJECT_PROPERTIES_PREFIX
 import static org.gradle.initialization.IGradlePropertiesLoader.SYSTEM_PROJECT_PROPERTIES_PREFIX
 
-@Flaky(because = 'https://github.com/gradle/gradle-private/issues/3859')
 class ConfigurationCacheGradlePropertiesIntegrationTest extends AbstractConfigurationCacheIntegrationTest {
 
     def "invalidates cache when set of Gradle property defining system properties changes"() {

diff --git a/...roovy/org/gradle/configurationcache/fixtures/SystemPropertiesCompositeBuildFixture.groovy b/...roovy/org/gradle/configurationcache/fixtures/SystemPropertiesCompositeBuildFixture.groovy
@@ -23,7 +23,9 @@ import org.gradle.test.fixtures.file.TestFile
 class SystemPropertiesCompositeBuildFixture {
 
     static Set<List<BuildWithSystemPropertyDefined>> definitions() {
-        Set<List<BuildWithSystemPropertyDefined>> containsIncludedBuildDefinitions = new HashSet()
+        // The order needs to be consistent here for the retry plugin to work,
+        // see https://github.com/gradle/gradle/pull/25605
+        Set<List<BuildWithSystemPropertyDefined>> containsIncludedBuildDefinitions = new LinkedHashSet<>()
 
         Set<List<BuildWithSystemPropertyDefined>> allDefinitions = [
             new RootBuild() as BuildWithSystemPropertyDefined,

diff --git a/...n/dsl/caching/BuildScanIntegrationTest.kt → ...l/integration/BuildScanIntegrationTest.kt b/...n/dsl/caching/BuildScanIntegrationTest.kt → ...l/integration/BuildScanIntegrationTest.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.kotlin.dsl.caching
+package org.gradle.kotlin.dsl.integration
 
+import org.gradle.kotlin.dsl.fixtures.AbstractKotlinIntegrationTest
 import org.gradle.kotlin.dsl.fixtures.normalisedPath
 import org.gradle.plugin.management.internal.autoapply.AutoAppliedDevelocityPlugin
 import org.hamcrest.CoreMatchers.containsString
@@ -24,7 +25,7 @@ import org.junit.Test
 import java.io.File
 
 
-class BuildScanIntegrationTest : AbstractScriptCachingIntegrationTest() {
+class BuildScanIntegrationTest : AbstractKotlinIntegrationTest() {
 
     @Test
     fun `using the gradle enterprise extension is deprecated`() {
@@ -51,7 +52,10 @@ class BuildScanIntegrationTest : AbstractScriptCachingIntegrationTest() {
             "The PluginDependencySpec.`gradle-enterprise` property has been deprecated. " +
                 "This is scheduled to be removed in Gradle 9.0. Please use 'id(\"com.gradle.develocity\") version \"${AutoAppliedDevelocityPlugin.VERSION}\"' instead. " +
                 "For more information, please refer to https://docs.gradle.org/current/kotlin-dsl/gradle/org.gradle.kotlin.dsl/gradle-enterprise.html in the Gradle documentation.")
-        executer.expectDeprecationWarning("WARNING: The following functionality has been deprecated and will be removed in the next major release of the Develocity Gradle plugin. For assistance with migration, see https://gradle.com/help/gradle-plugin-develocity-migration.")
+        executer.expectDeprecationWarning(
+            "WARNING: The following functionality has been deprecated and will be removed in the next major release of the Develocity Gradle plugin. " +
+                "Run with '-Ddevelocity.deprecation.captureOrigin=true' to see where the deprecated functionality is being used. " +
+                "For assistance with migration, see https://gradle.com/help/gradle-plugin-develocity-migration.")
         executer.expectDeprecationWarning("""- The deprecated "gradleEnterprise.buildScan.termsOfServiceUrl" API has been replaced by "develocity.buildScan.termsOfUseUrl"""")
         executer.expectDeprecationWarning("""- The deprecated "gradleEnterprise.buildScan.termsOfServiceAgree" API has been replaced by "develocity.buildScan.termsOfUseAgree"""")
         build("--scan", "--build-cache", "-Dscan.dump").apply {

diff --git a/released-versions.json b/released-versions.json
@@ -1,7 +1,7 @@
 {
   "latestReleaseSnapshot": {
-    "version": "8.8-20240514011648+0000",
-    "buildTime": "20240514011648+0000"
+    "version": "8.8-20240515011607+0000",
+    "buildTime": "20240515011607+0000"
   },
   "latestRc": {
     "version": "8.8-rc-1",