Skip to content

Commit

Permalink
Merge pull request scala#11467 from ekrich/topic/sconfig-update
Browse files Browse the repository at this point in the history
Community build sconfig update
  • Loading branch information
anatoliykmetyuk committed Feb 19, 2021
2 parents 2d4376a + 929ba9c commit aa7c21e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion community-build/community-projects/sconfig
Submodule sconfig updated 50 files
+12 −0 .github/workflows/ci.yml
+20 −0 .github/workflows/release.yml
+13 −13 .gitignore
+6 −0 .scalafmt.conf
+2 −14 .travis.yml
+20 −9 README.md
+39 −58 build.sbt
+16 −4 docs/SCALA-NATIVE.md
+1 −4 examples/java/simple-lib/src/main/java/simplelib/SimpleLibContext.java
+1 −1 project/build.properties
+6 −10 project/plugins.sbt
+0 −1 sconfig/.gitignore
+11 −0 sconfig/js/src/main/scala/PlatformClassLoader.scala
+0 −11 sconfig/js/src/main/scala/PlatformProperties.scala
+0 −8 sconfig/js/src/main/scala/java/lang/ClassLoader.scala
+3 −4 sconfig/jvm/src/main/scala/org/ekrich/config/impl/ConfigBeanImpl.scala
+2 −2 sconfig/jvm/src/test/java/beanconfig/BooleansConfig.java
+2 −4 sconfig/jvm/src/test/java/beanconfig/NumbersConfig.java
+8 −6 sconfig/jvm/src/test/scala/org/ekrich/config/impl/TestUtils.scala
+0 −1 sconfig/jvm/src/test/scala/org/ekrich/config/impl/ValidationTest.scala
+24 −0 sconfig/native/src/test/scala/ConfigFactoryTest.scala
+0 −59 sconfig/native/src/test/scala/ConfigFactoryTests.scala
+11 −0 sconfig/shared/src/main/scala/ClassLoaderLike.scala
+0 −12 sconfig/shared/src/main/scala/PropertiesLike.scala
+15 −12 sconfig/shared/src/main/scala/org/ekrich/config/ConfigException.scala
+11 −11 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigDocumentParser.scala
+1 −1 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImpl.scala
+5 −5 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigImplUtil.scala
+5 −5 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigNodeObject.scala
+3 −4 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigNumber.scala
+5 −5 sconfig/shared/src/main/scala/org/ekrich/config/impl/ConfigParser.scala
+2 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/DefaultTransformer.scala
+30 −27 sconfig/shared/src/main/scala/org/ekrich/config/impl/Parseable.scala
+1 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/Path.scala
+2 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/PathBuilder.scala
+6 −6 sconfig/shared/src/main/scala/org/ekrich/config/impl/PathParser.scala
+2 −3 sconfig/shared/src/main/scala/org/ekrich/config/impl/PropertiesParser.scala
+4 −6 sconfig/shared/src/main/scala/org/ekrich/config/impl/ResolveContext.scala
+1 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/ResolveMemos.scala
+3 −3 sconfig/shared/src/main/scala/org/ekrich/config/impl/SerializedConfigValue.scala
+2 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfig.scala
+2 −2 sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfigObject.scala
+7 −7 sconfig/shared/src/main/scala/org/ekrich/config/impl/SimpleConfigOrigin.scala
+13 −13 sconfig/shared/src/main/scala/org/ekrich/config/impl/Tokenizer.scala
+4 −6 sconfig/shared/src/test/scala/ConfigFactoryTests.scala
+84 −0 sconfig/shared/src/test/scala/junit/AssertThrows.scala
+11 −0 sconfig/sharedjvmnative/src/main/scala/PlatformClassLoader.scala
+0 −11 sconfig/sharedjvmnative/src/main/scala/PlatformProperties.scala
+6 −0 scripts/git-release
+6 −7 scripts/travis-os-setup.sh
4 changes: 4 additions & 0 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ object Versions:
val munit = "0.7.19+DOTTY-SNAPSHOT"
val scodecBits = "1.1+DOTTY-SNAPSHOT"
val simulacrumScalafix = "0.5.1-SNAPSHOT"
val scalaCollectionCompat = "2.3.0+DOTTY-SNAPSHOT"

sealed trait CommunityProject:
private var published = false
Expand Down Expand Up @@ -158,6 +159,7 @@ final case class SbtCommunityProject(
s""""org.typelevel" %% "coop" % "${Versions.coop}"""",
s""""org.typelevel" %% "coop_sjs1" % "${Versions.coop}"""",
s""""dev.zio" %% "izumi-reflect" % "${Versions.izumiReflect}"""",
s""""org.scala-lang.modules" %% "scala-collection-compat" % "${Versions.scalaCollectionCompat}"""",
)

private val baseCommand =
Expand Down Expand Up @@ -408,6 +410,7 @@ object projects:
project = "sconfig",
sbtTestCommand = "sconfigJVM/test",
sbtDocCommand = "sconfigJVM/doc",
dependencies = List(scalaCollectionCompat)
)

lazy val zio = SbtCommunityProject(
Expand Down Expand Up @@ -506,6 +509,7 @@ object projects:
lazy val scalaCollectionCompat = SbtCommunityProject(
project = "scala-collection-compat",
sbtTestCommand = "compat30/test",
sbtPublishCommand = s"""set every version := "${Versions.scalaCollectionCompat}"; compat30/publishLocal""",
)

lazy val verify = SbtCommunityProject(
Expand Down

0 comments on commit aa7c21e

Please sign in to comment.