Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cross-version-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
gradleVersion: ["6.8.3", "6.9.4", "7.0.2", "8.0.2"]
gradleVersion: ["6.8.3", "6.9.4", "7.0.2", "8.0.2", "8.14.2"]
steps:
- name: git clone
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ gradlePlugin {

dependencies {
testImplementation("org.gradle.exemplar:samples-check:1.0.3")
testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
testImplementation("org.spockframework:spock-core:2.3-groovy-4.0")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
}

testing.suites.named<JvmTestSuite>("test") {
useJUnitJupiter()
listOf("6.8.3", "6.9.4", "7.0.2", "8.0.2").forEach { gradleVersionUnderTest ->
listOf("6.8.3", "6.9.4", "7.0.2", "8.0.2", "8.14.2").forEach { gradleVersionUnderTest ->
targets.register("test${gradleVersionUnderTest}") {
testTask {
group = LifecycleBasePlugin.VERIFICATION_GROUP
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionSha256Sum=5086034b0656a79fee07a04cfadc103984b075ac85d3a20748649671283be1bb
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class GuavaCapabilityConflictResolutionTest extends Specification {
buildFile << """
plugins {
id("org.gradlex.jvm-dependency-conflict-resolution")
id("com.android.library") version "7.4.0"
id("com.android.library") version "8.10.1"
}

repositories {
Expand All @@ -75,6 +75,7 @@ class GuavaCapabilityConflictResolutionTest extends Specification {
}

android {
namespace = "com.example.myapp"
compileSdk = 30
}

Expand Down
Loading