Skip to content

Support Gradle 9 semantic versioning #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcumings merged 6 commits into from
Jun 18, 2025
Merged

Support Gradle 9 semantic versioning #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87febdb
Support Gradle 9 semantic versioning
mcumings Jun 18, 2025
1bcfba4
Use `gradle` from PATH
mcumings Jun 18, 2025
e943de7
force use of 8.11
mcumings Jun 18, 2025
7a202fa
test original failure
mcumings Jun 18, 2025
3137403
Revert "test original failure"
mcumings Jun 18, 2025
4d8196a
Use constant in error message
mcumings Jun 18, 2025
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
11 changes: 6 additions & 5 deletions .github/workflows/precommit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# wrapper = oldest supported version
# 8.11 = oldest supported version
# wrapper = supposed to be the oldest supported version but actually runs current
# current = latest stable version
# release-candidate = next stable version
# nightly = latest development version
gradle-version: ["wrapper", "current", "release-candidate", "nightly"]
gradle-version: ["8.11", "wrapper", "current", "release-candidate", "nightly"]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand All @@ -22,10 +23,10 @@ jobs:
with:
gradle-version: ${{ matrix.gradle-version }}
- name: Build Plugin
run: ./gradlew build
run: gradle build
- name: Sample Analysis
working-directory: sample
run: ../gradlew graphAnalysis
run: gradle graphAnalysis
- name: Sample Inspection
working-directory: sample
run: ../gradlew :app:graphInspection
run: gradle :app:graphInspection
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ org.gradle.caching=true
org.gradle.parallel=true
org.gradle.configuration-cache=true
org.gradle.unsafe.isolated-projects=true
version=1.1.0
version=1.1.1
16 changes: 6 additions & 10 deletions src/main/kotlin/com/ebay/plugins/graph/analytics/GraphAnalyticsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.gradle.api.attributes.Attribute
import org.gradle.api.initialization.Settings
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.TaskProvider
import org.gradle.util.GradleVersion
import org.jgrapht.graph.DefaultDirectedGraph
import org.jgrapht.nio.DefaultAttribute

Expand All @@ -32,14 +33,10 @@ internal class GraphAnalyticsPlugin : Plugin<Any> {

private fun applySettings(settings: Settings) {
// Verify Gradle version compatibility
val (major, minor) = settings.gradle.gradleVersion
.substringBefore("-") // Remove any qualifier like `-rc-1`
.split('.')
.take(2)
if (major.toInt() < GRADLE_VERSION_MAJOR || minor.toInt() < GRADLE_VERSION_MINOR) {
throw GradleException("GraphAnalyticsPlugin requires Gradle " +
"$GRADLE_VERSION_MAJOR.$GRADLE_VERSION_MINOR or later " +
"(was: ${settings.gradle.gradleVersion})")
if (GradleVersion.current() < GradleVersion.version(GRADLE_VERSION_MINIMUM)) {
throw GradleException("GraphAnalyticsPlugin requires Gradle $GRADLE_VERSION_MINIMUM " +
"or later (was: ${settings.gradle.gradleVersion})"
)
}

// Apply the plugin to all projects
Expand Down Expand Up @@ -348,8 +345,7 @@ internal class GraphAnalyticsPlugin : Plugin<Any> {
}

companion object {
private const val GRADLE_VERSION_MAJOR = 8
private const val GRADLE_VERSION_MINOR = 11
private const val GRADLE_VERSION_MINIMUM = "8.11"

const val EXTENSION_NAME = "graphAnalytics"
const val TASK_GROUP = "graph analytics"
Expand Down