update broken build

lemastero · Nov 1, 2024 · 71f77f9 · 71f77f9
1 parent d186706
commit 71f77f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/agda2scala.cabal b/agda2scala.cabal
@@ -34,9 +34,9 @@ library
                        Agda.Compiler.Scala.PrintScala3
                        Paths_agda2scala
   autogen-modules:     Paths_agda2scala
-  build-depends:       base >= 4.10 && < 4.20,
-                       containers > 0.6 && < 0.7,
-                       Agda >= 2.6.4 && < 2.6.5,
+  build-depends:       base >= 4.13 && < 4.21,
+                       containers > 0.6 && < 0.8,
+                       Agda >= 2.7 && < 2.8,
                        deepseq >= 1.4.4 && < 1.6,
                        text >= 1.2.3.1
   default-language:    Haskell2010
@@ -47,8 +47,8 @@ executable agda2scala
   main-is:          Main.hs
   other-modules:    Paths_agda2scala
   autogen-modules:  Paths_agda2scala
-  build-depends:    base >= 4.10 && < 4.20,
-                    Agda >= 2.6.4 && < 2.6.5,
+  build-depends:    base >= 4.13 && < 4.21,
+                    Agda >= 2.7 && < 2.8,
                     agda2scala
   default-language: Haskell2010
   import:           warnings
@@ -59,7 +59,7 @@ test-suite agda2scala-test
   type:             exitcode-stdio-1.0
   hs-source-dirs:   test
   main-is:          Main.hs
-  build-depends:    base >=4.10 && < 4.20,
-                    Agda >= 2.6.4 && < 2.6.5,
+  build-depends:    base >= 4.13 && < 4.21,
+                    Agda >= 2.7 && < 2.8,
                     HUnit >= 1.6.2.0,
                     agda2scala
diff --git a/examples/adts.scala b/examples/adts.scala
@@ -13,5 +13,5 @@ final case class RgbPair(snd: Bool, fst: Rgb)
 
 def idRgb(theArg: Rgb): Rgb = theArg
 
-def and0(rgbArg: Rgb, rgbPairArg: RgbPair): RgbPair = rgbPairArg
+def constRgbPair(rgbArg: Rgb, rgbPairArg: RgbPair): RgbPair = rgbPairArg
 }
diff --git a/scala2/src/main/scala/examples/adts.scala b/scala2/src/main/scala/examples/adts.scala
@@ -1,5 +1,3 @@
-package examples
-
 object adts {
 
 sealed trait Rgb

diff --git a/src/Agda/Compiler/Scala/Backend.hs b/src/Agda/Compiler/Scala/Backend.hs
@@ -18,17 +18,9 @@ import System.Console.GetOpt ( OptDescr(Option), ArgDescr(ReqArg) )
 import Paths_agda2scala ( version )
 
 import Agda.Main ( runAgda )
-import Agda.Compiler.Backend (
-  Backend(..)
-  , Backend'(..)
-  , Definition
-  , Flag
-  , IsMain
-  , Recompile(..)
-  , TCM )
+import Agda.Compiler.Backend
 import Agda.Interaction.Options ( OptDescr )
 import Agda.Compiler.Common ( curIF, compileDir )
-import Agda.Compiler.Backend ( IsMain )
 import Agda.Syntax.Abstract.Name ( QName )
 import Agda.Syntax.Common.Pretty ( prettyShow )
 import Agda.Syntax.Common ( moduleNameParts )