From 2634ef8f8987df850208f384f5f36f58bd13b055 Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Fri, 24 May 2024 17:11:25 +0200 Subject: [PATCH 1/8] Use shared jenkinsfile default (master) branch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed90d98..b006dcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy -@Library('metaborg.jenkins.pipeline@develop') _ +@Library('metaborg.jenkins.pipeline') _ gradlePipeline( buildOtherBranch: false, From a5a88232641158e13de971caef113ca6db3d6d4a Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Mon, 22 Jul 2024 12:54:08 +0200 Subject: [PATCH 2/8] Update gradle.config --- build.gradle.kts | 2 +- plugin/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 669361a..87aa7ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ plugins { - id("org.metaborg.gradle.config.root-project") version "0.4.8" + id("org.metaborg.gradle.config.root-project") version "0.7.3" id("org.metaborg.gitonium") version "1.2.0" } diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 09ba4c5..5c5e102 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -13,8 +13,8 @@ buildscript { maven("https://artifacts.metaborg.org/content/groups/public/") } dependencies { - classpath("org.metaborg:gradle.config:0.7.1") classpath("org.metaborg:gitonium:1.1.0") + classpath("org.metaborg:gradle.config:0.7.3") } } } From 135d5fe8bb4ae12ef295a71143484e844f7c08aa Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Mon, 22 Jul 2024 12:54:31 +0200 Subject: [PATCH 3/8] Use Java 11 --- plugin/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 5c5e102..33cff09 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -63,8 +63,8 @@ if (standaloneBuild) { // If standalone build, apply additional plugins and set } configure { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } configure { kotlinApiVersion = "1.2" From 4ce6c362ed5cbb85dae4d0ea5743c2e89cd93e33 Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Mon, 22 Jul 2024 12:54:39 +0200 Subject: [PATCH 4/8] Synchronize Gitonium version --- plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 33cff09..68bb1df 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -13,8 +13,8 @@ buildscript { maven("https://artifacts.metaborg.org/content/groups/public/") } dependencies { - classpath("org.metaborg:gitonium:1.1.0") classpath("org.metaborg:gradle.config:0.7.3") + classpath("org.metaborg:gitonium:1.2.0") } } } From 16eb39c933b22b286946e27fdcedd8bb41fda9fe Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Mon, 22 Jul 2024 16:22:38 +0200 Subject: [PATCH 5/8] Update to Kotlin 1.3 --- plugin/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 68bb1df..53fc3f3 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -67,8 +67,8 @@ configure { targetCompatibility = JavaVersion.VERSION_11 } configure { - kotlinApiVersion = "1.2" - kotlinLanguageVersion = "1.2" + kotlinApiVersion = "1.3" + kotlinLanguageVersion = "1.3" } dependencies { From e7889fea3816042177b8ffc7a03e56fbdcbd9e9b Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Tue, 23 Jul 2024 16:23:42 +0200 Subject: [PATCH 6/8] Use latest Spoofax 2 release --- example/empty/empty.example/metaborg.yaml | 2 +- example/empty/empty.test/metaborg.yaml | 2 +- example/empty/empty/metaborg.yaml | 2 +- example/language_contribution_addition/metaborg.yaml | 2 +- example/language_contribution_override/metaborg.yaml | 2 +- example/stratego_format_override/metaborg.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/empty/empty.example/metaborg.yaml b/example/empty/empty.example/metaborg.yaml index e6942ca..e3aed5b 100644 --- a/example/empty/empty.example/metaborg.yaml +++ b/example/empty/empty.example/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty.example:0.1.0-SNAPSHOT name: empty -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" dependencies: compile: - org.metaborg:empty:0.1.0-SNAPSHOT diff --git a/example/empty/empty.test/metaborg.yaml b/example/empty/empty.test/metaborg.yaml index c0795a3..b57f207 100644 --- a/example/empty/empty.test/metaborg.yaml +++ b/example/empty/empty.test/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty.test:0.1.0-SNAPSHOT name: empty -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" dependencies: compile: - org.metaborg:empty:0.1.0-SNAPSHOT diff --git a/example/empty/empty/metaborg.yaml b/example/empty/empty/metaborg.yaml index 7b95c6f..261d85a 100644 --- a/example/empty/empty/metaborg.yaml +++ b/example/empty/empty/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty:0.1.0-SNAPSHOT name: empty -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" dependencies: compile: - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion} diff --git a/example/language_contribution_addition/metaborg.yaml b/example/language_contribution_addition/metaborg.yaml index 5ad672a..9684bff 100644 --- a/example/language_contribution_addition/metaborg.yaml +++ b/example/language_contribution_addition/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT name: language_contribution_addition -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" contributions: - name: language_contribution_addition id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT diff --git a/example/language_contribution_override/metaborg.yaml b/example/language_contribution_override/metaborg.yaml index 2e0d02f..508ebf3 100644 --- a/example/language_contribution_override/metaborg.yaml +++ b/example/language_contribution_override/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT name: language_contribution_override -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" contributions: - name: language_contribution_override id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT diff --git a/example/stratego_format_override/metaborg.yaml b/example/stratego_format_override/metaborg.yaml index 5123e2a..c4d3ea1 100644 --- a/example/stratego_format_override/metaborg.yaml +++ b/example/stratego_format_override/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:stratego_format_override:0.1.0-SNAPSHOT name: stratego_format_override -metaborgVersion: 2.6.0-SNAPSHOT +metaborgVersion: "2.5.20" dependencies: compile: - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion} From 18ab2e23e14bcbc46df790105f69c3283e71c40c Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Tue, 23 Jul 2024 16:24:08 +0200 Subject: [PATCH 7/8] Revert "Use latest Spoofax 2 release" This reverts commit e7889fea3816042177b8ffc7a03e56fbdcbd9e9b. --- example/empty/empty.example/metaborg.yaml | 2 +- example/empty/empty.test/metaborg.yaml | 2 +- example/empty/empty/metaborg.yaml | 2 +- example/language_contribution_addition/metaborg.yaml | 2 +- example/language_contribution_override/metaborg.yaml | 2 +- example/stratego_format_override/metaborg.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/empty/empty.example/metaborg.yaml b/example/empty/empty.example/metaborg.yaml index e3aed5b..e6942ca 100644 --- a/example/empty/empty.example/metaborg.yaml +++ b/example/empty/empty.example/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty.example:0.1.0-SNAPSHOT name: empty -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT dependencies: compile: - org.metaborg:empty:0.1.0-SNAPSHOT diff --git a/example/empty/empty.test/metaborg.yaml b/example/empty/empty.test/metaborg.yaml index b57f207..c0795a3 100644 --- a/example/empty/empty.test/metaborg.yaml +++ b/example/empty/empty.test/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty.test:0.1.0-SNAPSHOT name: empty -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT dependencies: compile: - org.metaborg:empty:0.1.0-SNAPSHOT diff --git a/example/empty/empty/metaborg.yaml b/example/empty/empty/metaborg.yaml index 261d85a..7b95c6f 100644 --- a/example/empty/empty/metaborg.yaml +++ b/example/empty/empty/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:empty:0.1.0-SNAPSHOT name: empty -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT dependencies: compile: - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion} diff --git a/example/language_contribution_addition/metaborg.yaml b/example/language_contribution_addition/metaborg.yaml index 9684bff..5ad672a 100644 --- a/example/language_contribution_addition/metaborg.yaml +++ b/example/language_contribution_addition/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT name: language_contribution_addition -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT contributions: - name: language_contribution_addition id: org.metaborg:language_contribution_addition:0.1.0-SNAPSHOT diff --git a/example/language_contribution_override/metaborg.yaml b/example/language_contribution_override/metaborg.yaml index 508ebf3..2e0d02f 100644 --- a/example/language_contribution_override/metaborg.yaml +++ b/example/language_contribution_override/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT name: language_contribution_override -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT contributions: - name: language_contribution_override id: org.metaborg:language_contribution_override:0.1.0-SNAPSHOT diff --git a/example/stratego_format_override/metaborg.yaml b/example/stratego_format_override/metaborg.yaml index c4d3ea1..5123e2a 100644 --- a/example/stratego_format_override/metaborg.yaml +++ b/example/stratego_format_override/metaborg.yaml @@ -1,7 +1,7 @@ --- id: org.metaborg:stratego_format_override:0.1.0-SNAPSHOT name: stratego_format_override -metaborgVersion: "2.5.20" +metaborgVersion: 2.6.0-SNAPSHOT dependencies: compile: - org.metaborg:org.metaborg.meta.lang.esv:${metaborgVersion} From cee20fc954ee8e5e923860621ef877aa5a3cb5d0 Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Wed, 24 Jul 2024 16:49:08 +0200 Subject: [PATCH 8/8] Update to Spoofax 2.5.21 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8f1fce5..16190e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ # These properties are only used when this repository is built stand-alone, outside of devenv. org.gradle.jvmargs=-Xms512M -Xmx2G -Xss8M -systemProp.spoofax2Version=2.5.20 +systemProp.spoofax2Version=2.5.21