From edf7414a58bfb565bffd767daf7aa8e6a3d251b7 Mon Sep 17 00:00:00 2001 From: Luca Ferranti <49938764+lucaferranti@users.noreply.github.com> Date: Mon, 13 May 2024 20:20:33 +0300 Subject: [PATCH] update to 2.0 (#85) * fix meetup exercise * fix gigasecond and pin chapel version * fix ci syntax * revert meetup update * update chapel version --- .github/workflows/test.yml | 2 +- exercises/practice/allergies/Mason.toml | 2 +- exercises/practice/anagram/Mason.toml | 2 +- exercises/practice/bob/Mason.toml | 2 +- exercises/practice/circular-buffer/Mason.toml | 2 +- exercises/practice/collatz-conjecture/Mason.toml | 2 +- exercises/practice/darts/Mason.toml | 2 +- exercises/practice/diamond/Mason.toml | 2 +- exercises/practice/difference-of-squares/Mason.toml | 2 +- exercises/practice/dominoes/Mason.toml | 2 +- exercises/practice/forth/Mason.toml | 2 +- exercises/practice/gigasecond/.meta/reference.chpl | 4 ++-- exercises/practice/gigasecond/Mason.toml | 2 +- exercises/practice/gigasecond/test/tests.chpl | 8 ++++---- exercises/practice/hello-world/Mason.toml | 2 +- exercises/practice/high-scores/Mason.toml | 2 +- exercises/practice/isogram/Mason.toml | 2 +- exercises/practice/leap/Mason.toml | 2 +- exercises/practice/meetup/Mason.toml | 2 +- exercises/practice/nucleotide-count/Mason.toml | 2 +- exercises/practice/pangram/Mason.toml | 2 +- exercises/practice/raindrops/Mason.toml | 2 +- exercises/practice/resistor-color/Mason.toml | 2 +- exercises/practice/rna-transcription/Mason.toml | 2 +- exercises/practice/roman-numerals/Mason.toml | 2 +- exercises/practice/series/Mason.toml | 2 +- exercises/practice/two-fer/Mason.toml | 2 +- exercises/practice/yacht/Mason.toml | 2 +- 28 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 67334d1..8017623 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: ci: runs-on: ubuntu-22.04 container: - image: chapel/chapel + image: chapel/chapel:2.0.0 steps: - name: Checkout repository diff --git a/exercises/practice/allergies/Mason.toml b/exercises/practice/allergies/Mason.toml index ec916fe..4722498 100644 --- a/exercises/practice/allergies/Mason.toml +++ b/exercises/practice/allergies/Mason.toml @@ -1,5 +1,5 @@ [brick] name="allergies" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/anagram/Mason.toml b/exercises/practice/anagram/Mason.toml index 7da06a2..cd2590f 100644 --- a/exercises/practice/anagram/Mason.toml +++ b/exercises/practice/anagram/Mason.toml @@ -1,5 +1,5 @@ [brick] name="anagram" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/bob/Mason.toml b/exercises/practice/bob/Mason.toml index f96d3ca..d1a4bd8 100644 --- a/exercises/practice/bob/Mason.toml +++ b/exercises/practice/bob/Mason.toml @@ -1,5 +1,5 @@ [brick] name="bob" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/circular-buffer/Mason.toml b/exercises/practice/circular-buffer/Mason.toml index eeb4185..e1cedf0 100644 --- a/exercises/practice/circular-buffer/Mason.toml +++ b/exercises/practice/circular-buffer/Mason.toml @@ -1,5 +1,5 @@ [brick] name="circular-buffer" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/collatz-conjecture/Mason.toml b/exercises/practice/collatz-conjecture/Mason.toml index f6acf86..39839ee 100644 --- a/exercises/practice/collatz-conjecture/Mason.toml +++ b/exercises/practice/collatz-conjecture/Mason.toml @@ -1,5 +1,5 @@ [brick] name="collatz-conjecture" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/darts/Mason.toml b/exercises/practice/darts/Mason.toml index f868d80..1b4f421 100644 --- a/exercises/practice/darts/Mason.toml +++ b/exercises/practice/darts/Mason.toml @@ -1,5 +1,5 @@ [brick] name="darts" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/diamond/Mason.toml b/exercises/practice/diamond/Mason.toml index 40a4079..a6dd795 100644 --- a/exercises/practice/diamond/Mason.toml +++ b/exercises/practice/diamond/Mason.toml @@ -1,5 +1,5 @@ [brick] name="diamond" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/difference-of-squares/Mason.toml b/exercises/practice/difference-of-squares/Mason.toml index 6dfc088..7fdd480 100644 --- a/exercises/practice/difference-of-squares/Mason.toml +++ b/exercises/practice/difference-of-squares/Mason.toml @@ -1,7 +1,7 @@ [brick] name="difference-of-squares" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" [dependencies] diff --git a/exercises/practice/dominoes/Mason.toml b/exercises/practice/dominoes/Mason.toml index f4c053b..8dff758 100644 --- a/exercises/practice/dominoes/Mason.toml +++ b/exercises/practice/dominoes/Mason.toml @@ -1,5 +1,5 @@ [brick] name="dominoes" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/forth/Mason.toml b/exercises/practice/forth/Mason.toml index ece87d6..7d78440 100644 --- a/exercises/practice/forth/Mason.toml +++ b/exercises/practice/forth/Mason.toml @@ -1,5 +1,5 @@ [brick] name="forth" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/gigasecond/.meta/reference.chpl b/exercises/practice/gigasecond/.meta/reference.chpl index c146745..eb58afb 100644 --- a/exercises/practice/gigasecond/.meta/reference.chpl +++ b/exercises/practice/gigasecond/.meta/reference.chpl @@ -2,9 +2,9 @@ module Gigasecond { // implement reference solution use Time; - const gigasecond = new timedelta(seconds=1000000000); + const gigasecond = new timeDelta(seconds=1000000000); - proc addGigasecond(moment: datetime) { + proc addGigasecond(moment: dateTime) { return moment + gigasecond; } } diff --git a/exercises/practice/gigasecond/Mason.toml b/exercises/practice/gigasecond/Mason.toml index 3bf3274..6505847 100644 --- a/exercises/practice/gigasecond/Mason.toml +++ b/exercises/practice/gigasecond/Mason.toml @@ -1,5 +1,5 @@ [brick] name="gigasecond" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/gigasecond/test/tests.chpl b/exercises/practice/gigasecond/test/tests.chpl index 40f1144..cea707f 100644 --- a/exercises/practice/gigasecond/test/tests.chpl +++ b/exercises/practice/gigasecond/test/tests.chpl @@ -3,14 +3,14 @@ use Time; use Gigasecond; proc testFullTimeSpecified(test : borrowed Test) throws { - var input = new datetime(2015, 01, 24, hour=22, minute=00, second=00), - expected = new datetime(2046, 10, 02, hour=23, minute=46, second=40); + var input = new dateTime(2015, 01, 24, hour=22, minute=00, second=00), + expected = new dateTime(2046, 10, 02, hour=23, minute=46, second=40); test.assertEqual(addGigasecond(input), expected); } proc testFullTimeWithDayRollOver(test : borrowed Test) throws { - var input = new datetime(2015, 01, 24, hour=23, minute=59, second=59), - expected = new datetime(2046, 10, 03, hour=01, minute=46, second=39); + var input = new dateTime(2015, 01, 24, hour=23, minute=59, second=59), + expected = new dateTime(2046, 10, 03, hour=01, minute=46, second=39); test.assertEqual(addGigasecond(input), expected); } diff --git a/exercises/practice/hello-world/Mason.toml b/exercises/practice/hello-world/Mason.toml index fe7dc5f..dafca85 100644 --- a/exercises/practice/hello-world/Mason.toml +++ b/exercises/practice/hello-world/Mason.toml @@ -1,5 +1,5 @@ [brick] name="hello-world" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/high-scores/Mason.toml b/exercises/practice/high-scores/Mason.toml index 09c3ec6..8c1c4b6 100644 --- a/exercises/practice/high-scores/Mason.toml +++ b/exercises/practice/high-scores/Mason.toml @@ -1,5 +1,5 @@ [brick] name="high-scores" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/isogram/Mason.toml b/exercises/practice/isogram/Mason.toml index dee6684..aff2b31 100644 --- a/exercises/practice/isogram/Mason.toml +++ b/exercises/practice/isogram/Mason.toml @@ -1,5 +1,5 @@ [brick] name="isogram" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/leap/Mason.toml b/exercises/practice/leap/Mason.toml index 54e3b1d..ef78ad3 100644 --- a/exercises/practice/leap/Mason.toml +++ b/exercises/practice/leap/Mason.toml @@ -1,5 +1,5 @@ [brick] name="leap" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/meetup/Mason.toml b/exercises/practice/meetup/Mason.toml index a32b5e9..c5ea4eb 100644 --- a/exercises/practice/meetup/Mason.toml +++ b/exercises/practice/meetup/Mason.toml @@ -1,5 +1,5 @@ [brick] name="meetup" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/nucleotide-count/Mason.toml b/exercises/practice/nucleotide-count/Mason.toml index 971087b..d94b554 100644 --- a/exercises/practice/nucleotide-count/Mason.toml +++ b/exercises/practice/nucleotide-count/Mason.toml @@ -1,5 +1,5 @@ [brick] name="nucleotide-count" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/pangram/Mason.toml b/exercises/practice/pangram/Mason.toml index ae78f7d..f86aa3e 100644 --- a/exercises/practice/pangram/Mason.toml +++ b/exercises/practice/pangram/Mason.toml @@ -1,5 +1,5 @@ [brick] name="pangram" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/raindrops/Mason.toml b/exercises/practice/raindrops/Mason.toml index dc66f42..7240bcc 100644 --- a/exercises/practice/raindrops/Mason.toml +++ b/exercises/practice/raindrops/Mason.toml @@ -1,5 +1,5 @@ [brick] name="raindrops" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/resistor-color/Mason.toml b/exercises/practice/resistor-color/Mason.toml index 7bbf540..793d71c 100644 --- a/exercises/practice/resistor-color/Mason.toml +++ b/exercises/practice/resistor-color/Mason.toml @@ -1,5 +1,5 @@ [brick] name="resistor-color" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/rna-transcription/Mason.toml b/exercises/practice/rna-transcription/Mason.toml index 1953f80..fee18e5 100644 --- a/exercises/practice/rna-transcription/Mason.toml +++ b/exercises/practice/rna-transcription/Mason.toml @@ -1,5 +1,5 @@ [brick] name="rna-transcription" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/roman-numerals/Mason.toml b/exercises/practice/roman-numerals/Mason.toml index 9830481..628d373 100644 --- a/exercises/practice/roman-numerals/Mason.toml +++ b/exercises/practice/roman-numerals/Mason.toml @@ -1,7 +1,7 @@ [brick] name="roman-numerals" version="0.1.0" -chplVersion="1.33.0" +chplVersion="2.0.0" type="application" [dependencies] diff --git a/exercises/practice/series/Mason.toml b/exercises/practice/series/Mason.toml index a4bf7d9..c30e1a3 100644 --- a/exercises/practice/series/Mason.toml +++ b/exercises/practice/series/Mason.toml @@ -1,5 +1,5 @@ [brick] name="series" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/two-fer/Mason.toml b/exercises/practice/two-fer/Mason.toml index 53cc08b..aabe811 100644 --- a/exercises/practice/two-fer/Mason.toml +++ b/exercises/practice/two-fer/Mason.toml @@ -1,5 +1,5 @@ [brick] name="two-fer" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application" diff --git a/exercises/practice/yacht/Mason.toml b/exercises/practice/yacht/Mason.toml index 965948e..f887da7 100644 --- a/exercises/practice/yacht/Mason.toml +++ b/exercises/practice/yacht/Mason.toml @@ -1,5 +1,5 @@ [brick] name="yacht" version="0.1.0" -chplVersion="1.28.0" +chplVersion="2.0.0" type="application"