Skip to content

Commit 6234fa5

Browse files
committed
Replace Lightbend Config with sconfig
1 parent 4ef6400 commit 6234fa5

File tree

717 files changed

+1556
-896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

717 files changed

+1556
-896
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# Replacing Lightbend Config (https://github.com/lightbend/config) with sconfig (https://github.com/ekrich/sconfig)
19+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.create")
20+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.apply")
21+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.config")
22+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.this")
23+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.internal.ActorSystemStub#config.defaultReference")
24+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit.applicationTestConfig")
25+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit.create")
26+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit.create")
27+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit.applicationTestConfig")
28+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ManualTime.config")
29+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource.this")
30+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig")
31+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.apply")
32+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.config")
33+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKitBase.this")
34+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.BehaviorTestKit.apply")
35+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.BehaviorTestKit.ApplicationTestConfig")
36+
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config")
37+
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit.this")

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed
1515

1616
import scala.concurrent.duration.{ Duration, FiniteDuration }
1717

18-
import com.typesafe.config.Config
18+
import org.ekrich.config.Config
1919

2020
import org.apache.pekko
2121
import pekko.actor.typed.ActorSystem

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package org.apache.pekko.actor.testkit.typed.internal
1616
import java.util.concurrent.{ CompletionStage, ThreadFactory }
1717
import scala.concurrent._
1818
import scala.annotation.nowarn
19-
import com.typesafe.config.{ Config, ConfigFactory }
19+
import org.ekrich.config.{ Config, ConfigFactory }
2020
import org.slf4j.Logger
2121
import org.slf4j.LoggerFactory
2222
import org.apache.pekko

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed.javadsl
1515

1616
import java.time.Duration
1717

18-
import com.typesafe.config.Config
18+
import org.ekrich.config.Config
1919

2020
import org.apache.pekko
2121
import pekko.actor.DeadLetter

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
1919
import pekko.actor.typed.receptionist.Receptionist
2020
import pekko.actor.typed.{ ActorRef, Behavior, Signal }
2121
import pekko.annotation.{ ApiMayChange, DoNotInherit }
22-
import com.typesafe.config.Config
22+
import org.ekrich.config.Config
2323

2424
import java.util.concurrent.ThreadLocalRandom
2525

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.pekko.actor.testkit.typed.javadsl
1919

2020
import org.apache.pekko
21-
import com.typesafe.config.Config
21+
import org.ekrich.config.Config
2222
import pekko.actor.testkit.typed.internal.TestKitUtils
2323
import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
2424
import pekko.actor.typed.ActorSystem

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import java.time.Duration
1717

1818
import scala.annotation.varargs
1919

20-
import com.typesafe.config.Config
20+
import org.ekrich.config.Config
2121

2222
import org.apache.pekko
2323
import pekko.actor.typed.ActorSystem

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package org.apache.pekko.actor.testkit.typed.javadsl
1515

1616
import java.time.Duration
1717

18-
import com.typesafe.config.Config
19-
import com.typesafe.config.ConfigFactory
18+
import org.ekrich.config.Config
19+
import org.ekrich.config.ConfigFactory
2020
import org.junit.Rule
2121
import org.junit.rules.ExternalResource
2222

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import scala.concurrent.Await
2020
import scala.concurrent.duration._
2121
import scala.reflect.ClassTag
2222

23-
import com.typesafe.config.Config
24-
import com.typesafe.config.ConfigFactory
23+
import org.ekrich.config.Config
24+
import org.ekrich.config.ConfigFactory
2525
import org.slf4j.LoggerFactory
2626

2727
import org.apache.pekko

actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package org.apache.pekko.actor.testkit.typed.scaladsl
1515

16-
import com.typesafe.config.Config
17-
import com.typesafe.config.ConfigFactory
16+
import org.ekrich.config.Config
17+
import org.ekrich.config.ConfigFactory
1818

1919
import org.apache.pekko
2020
import pekko.actor.DeadLetter

0 commit comments

Comments
 (0)