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

Jump to bottom

Move to 2.13.12 and remove compile warnings #323

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Move to 2.13.12 and remove compile warnings #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70d9c24
Move to Scaka 2.13.12 Adjust code to remove compiler warnings
rpiotrow Oct 16, 2023
c96d6e5
Add some more memory for SBT and ensure timezone is GMT
rpiotrow Oct 16, 2023
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
3 changes: 3 additions & 0 deletions .sbtopts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-J-Xmx6G
-J-Xss2M
-Duser.timezone=GMT
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbt.librarymanagement.ConflictWarning

val scala_2_12 = "2.12.18"
val scala_2_13 = "2.13.11"
val scala_2_13 = "2.13.12"
val scala_3 = "3.3.1"
val mainScalaVersion = scala_3
val supportedScalaVersions = Seq(scala_2_12, scala_2_13, scala_3)
Expand Down
1 change: 0 additions & 1 deletion scalacheck/src/main/scala-2/pl/iterators/kebs/scalacheck/Generators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package pl.iterators.kebs.scalacheck

import org.scalacheck.Arbitrary
import pl.iterators.kebs.scalacheck.CommonArbitrarySupport

trait Generator[T] extends CommonArbitrarySupport {
def ArbT: Arbitrary[T]
Expand Down
12 changes: 6 additions & 6 deletions scalacheck/src/main/scala/pl/iterators/kebs/scalacheck/ArbitrarySupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ trait KebsArbitraryPredefs {
}
})

implicit val arbUrl: Arbitrary[URL] = Arbitrary {
implicit val arbUri: Arbitrary[URI] = Arbitrary {
for {
protocol <- Gen.oneOf("http", "https", "ftp", "file")
domain <- Gen.alphaNumStr
protocol <- Gen.oneOf("http", "https", "ftp", "file")
domain <- Gen.alphaNumStr
subdomain <- Gen.alphaNumStr
path <- Gen.alphaNumStr
} yield new URL(s"$protocol://$subdomain.$domain.test/$path")
path <- Gen.alphaNumStr
} yield new URI(s"$protocol://$subdomain.$domain.test/$path")
}

implicit val arbUri: Arbitrary[URI] = Arbitrary(arbUrl.arbitrary.map(_.toURI))
implicit val arbUrl: Arbitrary[URL] = Arbitrary(arbUri.arbitrary.map(_.toURL))

}
4 changes: 2 additions & 2 deletions tagged-meta/src/main/scala/pl/iterators/kebs/tag/meta/tagged.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ final class macroImpl(val c: whitebox.Context) {
val implicitName = TermName(name.decodedName.toString + "CaseClass1Rep")

if (typeParams.isEmpty)
q"implicit val $implicitName = $caseClass1RepInstanceTree"
q"implicit val $implicitName: _root_.pl.iterators.kebs.macros.CaseClass1Rep[$selfType, $baseTypeName[..$baseParams]] = $caseClass1RepInstanceTree"
else
q"implicit def $implicitName[..$typeParams] = $caseClass1RepInstanceTree"
q"implicit def $implicitName[..$typeParams]: _root_.pl.iterators.kebs.macros.CaseClass1Rep[$selfType, $baseTypeName[..$baseParams]] = $caseClass1RepInstanceTree"
}

private def containsApply(trees: List[Tree]): Boolean = {
Expand Down
Loading