Skip to content

Commit

Permalink
Bump version to 5.0.0 (#116)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ex0ns
ex0ns authored May 29, 2021
1 parent 0e30d39 commit cd4fe9d
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 41 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ Table of contents
Add to your `build.sbt` file:
```scala
// Core with minimal dependencies, enough to spawn your first bot.
libraryDependencies += "com.bot4s" %% "telegram-core" % "4.4.0-RC2"
libraryDependencies += "com.bot4s" %% "telegram-core" % "5.0.0"

// Extra goodies: Webhooks, support for games, bindings for actors.
libraryDependencies += "com.bot4s" %% "telegram-akka" % "4.4.0-RC2"
libraryDependencies += "com.bot4s" %% "telegram-akka" % "5.0.0"
```

For [mill](https://www.lihaoyi.com/mill/) add to your `build.sc` project deps:
```scala
ivy"com.bot4s::telegram-core:4.4.0-RC2", // core
ivy"com.bot4s::telegram-akka:4.4.0-RC2" // extra goodies
ivy"com.bot4s::telegram-core:5.0.0", // core
ivy"com.bot4s::telegram-akka:5.0.0" // extra goodies
```

## Leaking bot tokens
Expand Down
73 changes: 36 additions & 37 deletions build.sc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import mill.scalalib._
import mill.scalalib.publish._
import ammonite.ops._

val ScalaVersions = Seq("2.12.13", "2.13.5")
val ScalaVersions = Seq("2.12.13", "2.13.6")

object library {

Expand All @@ -27,42 +27,42 @@ object library {
val monix = "3.3.0"
}

val akkaHttp = ivy"com.typesafe.akka::akka-http::${Version.akkaHttp}"
val akkaHttpTestkit = ivy"com.typesafe.akka::akka-http-testkit::${Version.akkaHttp}"
val akkaTestkit = ivy"com.typesafe.akka::akka-testkit::${Version.akkaTestkit}"
val akkaActor = ivy"com.typesafe.akka::akka-actor::${Version.akkaActor}"
val akkaStream = ivy"com.typesafe.akka::akka-stream::${Version.akkaStream}"
val asyncHttpClientBackendCats = ivy"com.softwaremill.sttp.client3::async-http-client-backend-cats::${Version.sttp}"
val akkaHttp = ivy"com.typesafe.akka::akka-http::${Version.akkaHttp}"
val akkaHttpTestkit = ivy"com.typesafe.akka::akka-http-testkit::${Version.akkaHttp}"
val akkaTestkit = ivy"com.typesafe.akka::akka-testkit::${Version.akkaTestkit}"
val akkaActor = ivy"com.typesafe.akka::akka-actor::${Version.akkaActor}"
val akkaStream = ivy"com.typesafe.akka::akka-stream::${Version.akkaStream}"
val asyncHttpClientBackendCats = ivy"com.softwaremill.sttp.client3::async-http-client-backend-cats::${Version.sttp}"
val asyncHttpClientBackendMonix = ivy"com.softwaremill.sttp.client3::async-http-client-backend-monix::${Version.sttp}"
val scalajHttp = ivy"org.scalaj::scalaj-http::${Version.scalajHttp}"
val scalaLogging = ivy"com.typesafe.scala-logging::scala-logging::${Version.scalaLogging}"
val scalaMockScalaTest = ivy"org.scalamock::scalamock::${Version.scalaMockScalaTest}"
val akkaHttpCors = ivy"ch.megard::akka-http-cors::${Version.akkaHttpCors}"
val scalaTest = ivy"org.scalatest::scalatest::${Version.scalaTest}"
val logback = ivy"ch.qos.logback:logback-classic::${Version.logback}"
val circeCore = ivy"io.circe::circe-core::${Version.circe}"
val circeGeneric = ivy"io.circe::circe-generic::${Version.circe}"
val circeGenericExtras = ivy"io.circe::circe-generic-extras::${Version.circe}"
val circeParser = ivy"io.circe::circe-parser::${Version.circe}"
val circeLiteral = ivy"io.circe::circe-literal::${Version.circe}"
val catsCore = ivy"org.typelevel::cats-core::${Version.cats}"
val catsFree = ivy"org.typelevel::cats-free::${Version.cats}"
val catsEffect = ivy"org.typelevel::cats-effect::${Version.catsEffect}"
val monix = ivy"io.monix::monix::${Version.monix}"
val sttpCore = ivy"com.softwaremill.sttp.client3::core::${Version.sttp}"
val sttpCirce = ivy"com.softwaremill.sttp.client3::circe::${Version.sttp}"
val sttpOkHttp = ivy"com.softwaremill.sttp.client3::okhttp-backend::${Version.sttp}"
val hammock = ivy"com.pepegar::hammock-core::${Version.hammock}"
val scalajHttp = ivy"org.scalaj::scalaj-http::${Version.scalajHttp}"
val scalaLogging = ivy"com.typesafe.scala-logging::scala-logging::${Version.scalaLogging}"
val scalaMockScalaTest = ivy"org.scalamock::scalamock::${Version.scalaMockScalaTest}"
val akkaHttpCors = ivy"ch.megard::akka-http-cors::${Version.akkaHttpCors}"
val scalaTest = ivy"org.scalatest::scalatest::${Version.scalaTest}"
val logback = ivy"ch.qos.logback:logback-classic::${Version.logback}"
val circeCore = ivy"io.circe::circe-core::${Version.circe}"
val circeGeneric = ivy"io.circe::circe-generic::${Version.circe}"
val circeGenericExtras = ivy"io.circe::circe-generic-extras::${Version.circe}"
val circeParser = ivy"io.circe::circe-parser::${Version.circe}"
val circeLiteral = ivy"io.circe::circe-literal::${Version.circe}"
val catsCore = ivy"org.typelevel::cats-core::${Version.cats}"
val catsFree = ivy"org.typelevel::cats-free::${Version.cats}"
val catsEffect = ivy"org.typelevel::cats-effect::${Version.catsEffect}"
val monix = ivy"io.monix::monix::${Version.monix}"
val sttpCore = ivy"com.softwaremill.sttp.client3::core::${Version.sttp}"
val sttpCirce = ivy"com.softwaremill.sttp.client3::circe::${Version.sttp}"
val sttpOkHttp = ivy"com.softwaremill.sttp.client3::okhttp-backend::${Version.sttp}"
val hammock = ivy"com.pepegar::hammock-core::${Version.hammock}"
}


trait Bot4sTelegramModule extends CrossScalaModule {

override def scalacOptions = Seq(
"-unchecked",
"-deprecation",
"-language:_",
"-encoding", "UTF-8",
"-encoding",
"UTF-8",
"-feature",
"-unchecked",
"-Xlint:_",
Expand Down Expand Up @@ -111,7 +111,7 @@ abstract class Bot4sTelegramCrossPlatform(val platformSegment: String, location:

trait Publishable extends PublishModule {

override def publishVersion = "4.4.0-RC2"
override def publishVersion = "5.0.0"

def pomSettings = PomSettings(
description = "Telegram Bot API wrapper for Scala",
Expand All @@ -129,7 +129,7 @@ abstract class Bot4sTelegramCore(platformSegment: String) extends Bot4sTelegramC

object core extends Module {

object jvm extends Cross[CoreJvmModule](ScalaVersions: _ *)
object jvm extends Cross[CoreJvmModule](ScalaVersions: _*)

class CoreJvmModule(val crossScalaVersion: String) extends Bot4sTelegramCore("jvm") with Publishable {
override def ivyDeps = super.ivyDeps() ++ Agg(
Expand All @@ -147,7 +147,7 @@ abstract class Bot4sTelegramAkka extends Bot4sTelegramCrossPlatform("jvm", "akka

object akka extends Module {

object jvm extends Cross[AkkaModule](ScalaVersions: _ *)
object jvm extends Cross[AkkaModule](ScalaVersions: _*)

class AkkaModule(val crossScalaVersion: String) extends Bot4sTelegramAkka with Publishable {
override def artifactName = "telegram-akka"
Expand All @@ -171,11 +171,12 @@ object akka extends Module {
}
}

abstract class Bot4sTelegramExamples(platformSegment: String) extends Bot4sTelegramCrossPlatform(platformSegment, "examples")
abstract class Bot4sTelegramExamples(platformSegment: String)
extends Bot4sTelegramCrossPlatform(platformSegment, "examples")

object examples extends Module {

object jvm extends Cross[ExamplesJvmModule](ScalaVersions: _ *)
object jvm extends Cross[ExamplesJvmModule](ScalaVersions: _*)

class ExamplesJvmModule(val crossScalaVersion: String) extends Bot4sTelegramExamples("jvm") {
override def moduleDeps = super.moduleDeps ++ Seq(core.jvm(), akka.jvm())
Expand All @@ -187,8 +188,6 @@ object examples extends Module {
)
}



object catsjvm extends Cross[ExamplesCatsModule](ScalaVersions: _*)

class ExamplesCatsModule(val crossScalaVersion: String) extends Bot4sTelegramExamples("cats") {
Expand All @@ -199,7 +198,7 @@ object examples extends Module {
library.catsEffect
)

override def sources = T.sources { build.millSourcePath / "examples" / "src-cats" }
override def sources = T.sources(build.millSourcePath / "examples" / "src-cats")
}

object monixjvm extends Cross[ExamplesMonixModule](ScalaVersions: _*)
Expand All @@ -212,6 +211,6 @@ object examples extends Module {
library.monix
)

override def sources = T.sources { build.millSourcePath / "examples" / "src-monix" }
override def sources = T.sources(build.millSourcePath / "examples" / "src-monix")
}
}

0 comments on commit cd4fe9d

Please sign in to comment.