Skip to content

Commit

Permalink
Update Scala and cats
Browse files Browse the repository at this point in the history
  • Loading branch information
Kotori316 committed Oct 21, 2023
1 parent f90865f commit 67044ff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ dependencies {

// Jar in Jar
jarJar(group: 'org.scala-lang', name: 'scala-library', version: "[$project.scala_version, 3.0)") { transitive = false }
jarJar(group: 'org.scala-lang', name: 'scala3-library_3', version: "[$project.scala3_version, 3.3.1)") { transitive = false }
jarJar(group: 'org.scala-lang', name: 'scala3-library_3', version: "[3.0, $project.scala3_version]") { transitive = false }
jarJar(group: 'org.typelevel', name: "cats-core_3", version: "[2.0, $cats_version]") { transitive = false }
jarJar(group: 'org.typelevel', name: "cats-kernel_3", version: "[2.0, $cats_version]") { transitive = false }
jarJar(group: 'org.typelevel', name: "cats-free_3", version: "[2.0, $cats_version]") { transitive = false }
Expand Down Expand Up @@ -332,7 +332,7 @@ def getChangelog() {
Scala3: ${project.scala3_version}
Scala: ${project.scala_version}
Cats: ${project.cats_version}, modified version of 2.9.0
Cats: ${project.cats_version}
""".stripIndent()
return t
}
Expand Down Expand Up @@ -395,3 +395,4 @@ tasks.register('data') {
end_group()
}
}

8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
scala_version=2.13.11
scala3_version=3.3.0
cats_version=2.9.2-kotori
build_number=2
scala_version=2.13.12
scala3_version=3.3.1
cats_version=2.10.0-kotori
build_number=0
forgeVersion=1.20.1-47.1.28
branch=1.20
# https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/parchment-1.20.1/
Expand Down

0 comments on commit 67044ff

Please sign in to comment.