Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit ed3e0bb

Browse files
committed
Remove scala dependency and suffix from api
The api is written in java. It doesn't use scala, so we can remove it from the dependencies. We can also drop the scala version suffix, because it is theoretically compatible with any scala version.
1 parent dfa2550 commit ed3e0bb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bootstrap/src/main/scala/DependencyDownloader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object DependencyDownloader {
3535
deps.dependencies
3636
.filterNot(_._1 == Configuration.provided) // Provided deps are... well provided and no download is required
3737
.map(_._2)
38-
.filter(_.module.name.value != "chatoverflow-api_2.12") // We already have the api locally inside the bin directory
38+
.filter(_.module.name.value != "chatoverflow-api") // We already have the api locally inside the bin directory
3939
case Left(errorMsg) =>
4040
println(s"Pom containing all required dependencies for the framework couldn't be parsed: $errorMsg")
4141
Seq()

build/src/main/scala/org/codeoverflow/chatoverflow/build/deployment/DeploymentUtility.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ object DeploymentUtility {
111111

112112
val sourceJarDirectories = List(
113113
Some(s"target/scala-$scalaLibraryVersion/"),
114-
if (copyApi) Some(s"api/target/scala-$scalaLibraryVersion/") else None
114+
if (copyApi) Some(s"api/target/") else None
115115
).flatten
116116

117117
sourceJarDirectories.foreach(d => copyJars(d, targetDirs, logger))

src/main/scala/org/codeoverflow/chatoverflow/framework/helper/PluginLoader.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class PluginLoader(private val jar: File) extends WithLogger {
163163
}
164164

165165
Future(CoursierUtils.parsePom(pomIs))
166-
.map(dependencies => dependencies.filter(_.module.name.value != "chatoverflow-api_2.12"))
166+
.map(dependencies => dependencies.filter(_.module.name.value != "chatoverflow-api"))
167167
.map(dependencies => CoursierUtils.fetchDependencies(dependencies))
168168
.andThen {
169169
case Success(jarFiles) =>

0 commit comments

Comments
 (0)