Skip to content
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

feat: Use semver4j to parse Dafny version and ignore build metadata #13

Merged
merged 4 commits into from
Dec 10, 2024
Merged

feat: Use semver4j to parse Dafny version and ignore build metadata #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
383f5ed
Use semver4j to parse Dafny version, update CI
robin-aws Dec 10, 2024
df2b72e
Fix CI
robin-aws Dec 10, 2024
da215d2
Debugging CI
robin-aws Dec 10, 2024
e9b2b73
Fix Dafny version
robin-aws Dec 10, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
java-version: '17'
distribution: 'corretto'
- name: Set up Dafny
uses: dafny-lang/setup-dafny-action@v1.6.1
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: "4.1.0"
dafny-version: "4.9.0"
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: build
arguments: build --info --stacktrace
7 changes: 5 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
*/

plugins {
// Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
`java-gradle-plugin`
// Apply the Plugin Publish plugin to make plugin publication possible
// The Plugin Publish plugin will in turn auto-apply the Gradle Plugin Development Plugin (java-gradle-plugin)
// and the Maven Publish plugin (maven-publish)
id("com.gradle.plugin-publish") version "1.2.0"

`maven-publish`
}
Expand All @@ -22,6 +24,7 @@ repositories {
}

dependencies {
implementation("org.semver4j:semver4j:5.4.1")
// Use JUnit Jupiter for testing.
testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
}
Expand Down
5 changes: 2 additions & 3 deletions examples/multi-project-incompatible/consumer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ plugins {
dependencies {
implementation(project(":producer"))

// TODO: Replace with 4.1.0 once released
implementation("org.dafny:DafnyRuntime:4.0.0")
implementation("org.dafny:DafnyRuntime:4.9.0")
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")

optionsMap.put("unicode-char", true)
}
5 changes: 2 additions & 3 deletions examples/multi-project-incompatible/producer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ plugins {
}

dependencies {
// TODO: Replace with 4.1.0 once released
implementation("org.dafny:DafnyRuntime:4.0.0")
implementation("org.dafny:DafnyRuntime:4.9.0")
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")

optionsMap.put("unicode-char", false)
}
5 changes: 2 additions & 3 deletions examples/multi-project/consumer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ plugins {
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")
}

dependencies {
implementation(project(":producer"))

// TODO: Replace with 4.1.0 once released
implementation("org.dafny:DafnyRuntime:4.0.0")
implementation("org.dafny:DafnyRuntime:4.9.0")
}
5 changes: 2 additions & 3 deletions examples/multi-project/producer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ plugins {
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")

optionsMap.put("function-syntax", 3)
}

dependencies {
// TODO: Replace with 4.1.0 once released
implementation("org.dafny:DafnyRuntime:4.0.0")
implementation("org.dafny:DafnyRuntime:4.9.0")
}
4 changes: 2 additions & 2 deletions examples/multi-project/producer/src/main/dafny/timesTwo.dfy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module {:options "--function-syntax:4"} LibraryModule {
module LibraryModule {

function TimesTwo(x: nat): nat {
function method TimesTwo(x: nat): nat {
x * 2
}
}
2 changes: 1 addition & 1 deletion examples/no-dafny/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ repositories {
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")
}
2 changes: 1 addition & 1 deletion examples/simple-verify/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ repositories {
}

dafny {
dafnyVersion.set("4.1.0")
dafnyVersion.set("4.9.0")
}
4 changes: 2 additions & 2 deletions src/functionalTest/java/org/dafny/gradle/plugin/DafnyPluginFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ class DafnyPluginFunctionalTest {
.buildAndFail();

Assertions.assertTrue(result.getOutput().contains(
"examples/simple-verify/src/main/dafny/simple.dfy(2,15): Error: assertion might not hold"));
"examples/simple-verify/src/main/dafny/simple.dfy(2,9): Error: assertion might not hold"));
Assertions.assertTrue(result.getOutput().contains(
"examples/simple-verify/src/main/dafny/nested/simple.dfy(2,15): Error: assertion might not hold"));
"examples/simple-verify/src/main/dafny/nested/simple.dfy(2,9): Error: assertion might not hold"));
}

@Test void canReferenceDependencies() throws IOException {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/dafny/gradle/plugin/DafnyVersionCheckTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.gradle.api.provider.Property;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.TaskAction;
import org.semver4j.Semver;

import java.io.IOException;
import java.util.List;
Expand All @@ -18,9 +19,9 @@ public void checkVersion() throws IOException, InterruptedException {
List<String> args = List.of("--version");
DafnyCLIResult result = invokeDafnyCLI(args);

String expected = getRequiredVersion().get();
String actual = result.stdout().trim();
if (!expected.equals(actual)) {
Semver expected = Semver.parse(getRequiredVersion().get());
Semver actual = Semver.parse(result.stdout().trim());
if (!expected.isEquivalentTo(actual)) {
throw new GradleException("Incorrect Dafny version: expected " + expected + ", found " + actual);
}
}
Expand Down
Loading