raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Update typesafe config to 1.3.4 (#26875)

Browse source 
Link to latest version of the Typesafe Config Library API docs
This commit is contained in:
Philippus Baalman 2019-05-07 12:47:26 +02:00 • committed by Johan Andrén
parent 8c0a79b7b1
commit 70c3d08b5a
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -193,14 +193,14 @@ object ActorSystem {
* then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader
* associated with the ActorSystem class. * associated with the ActorSystem class.
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create(name: String, config: Config): ActorSystem = apply(name, config) def create(name: String, config: Config): ActorSystem = apply(name, config)
/** /**
* Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader) def create(name: String, config: Config, classLoader: ClassLoader): ActorSystem = apply(name, config, classLoader)
@ -217,7 +217,7 @@ object ActorSystem {
* executor = "default-executor", including those that have not defined the executor setting and thereby fallback * executor = "default-executor", including those that have not defined the executor setting and thereby fallback
* to the default of "default-dispatcher.executor". * to the default of "default-dispatcher.executor".
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def create( def create(
name: String, name: String,
@ -270,14 +270,14 @@ object ActorSystem {
* then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader * then tries to walk the stack to find the callers class loader, then falls back to the ClassLoader
* associated with the ActorSystem class. * associated with the ActorSystem class.
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None) def apply(name: String, config: Config): ActorSystem = apply(name, Option(config), None, None)
/** /**
* Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader * Creates a new ActorSystem with the specified name, the specified Config, and specified ClassLoader
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem = def apply(name: String, config: Config, classLoader: ClassLoader): ActorSystem =
apply(name, Option(config), Option(classLoader), None) apply(name, Option(config), Option(classLoader), None)
@ -291,7 +291,7 @@ object ActorSystem {
* If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback". * If no ExecutionContext is given, the system will fallback to the executor configured under "akka.actor.default-dispatcher.default-executor.fallback".
* The system will use the passed in config, or falls back to the default reference configuration using the ClassLoader. * The system will use the passed in config, or falls back to the default reference configuration using the ClassLoader.
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
def apply( def apply(
name: String, name: String,
@ -305,7 +305,7 @@ object ActorSystem {
* *
* For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration" * For more detailed information about the different possible configuration options, look in the Akka Documentation under "Configuration"
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
class Settings(classLoader: ClassLoader, cfg: Config, final val name: String, val setup: ActorSystemSetup) { class Settings(classLoader: ClassLoader, cfg: Config, final val name: String, val setup: ActorSystemSetup) {
@ -314,7 +314,7 @@ object ActorSystem {
/** /**
* The backing Config of this ActorSystem's Settings * The backing Config of this ActorSystem's Settings
* *
* @see <a href="https://lightbend.github.io/config/v1.3.1/" target="_blank">The Typesafe Config Library API Documentation</a> * @see <a href="https://lightbend.github.io/config/latest/api/index.html" target="_blank">The Typesafe Config Library API Documentation</a>
*/ */
final val config: Config = { final val config: Config = {
val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader)) val config = cfg.withFallback(ConfigFactory.defaultReference(classLoader))

3
project/Dependencies.scala
View file

@ -34,8 +34,7 @@ object Dependencies {
object Compile { object Compile {
// Compile // Compile
// when updating config version, update links ActorSystem ScalaDoc to link to the updated version val config = "com.typesafe" % "config" % "1.3.4" // ApacheV2
val config = "com.typesafe" % "config" % "1.3.3" // ApacheV2
val netty = "io.netty" % "netty" % "3.10.6.Final" // ApacheV2 val netty = "io.netty" % "netty" % "3.10.6.Final" // ApacheV2
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion // Scala License val scalaXml = "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion // Scala License