-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1000 from fthomas/topic/merge-master-into-0.10
Merge master into series/0.10
- Loading branch information
Showing
17 changed files
with
137 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,9 @@ name: Continuous Integration | |
|
|
||
| on: | ||
| pull_request: | ||
| branches: ['*'] | ||
| branches: ['**'] | ||
| push: | ||
| branches: ['*'] | ||
| branches: ['**'] | ||
| tags: [v*] | ||
|
|
||
| env: | ||
|
|
@@ -23,7 +23,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.12.13, 2.13.5, 3.0.0] | ||
| scala: [2.12.14, 2.13.6, 3.0.1] | ||
| java: [[email protected]] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
|
|
@@ -33,7 +33,7 @@ jobs: | |
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v12 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
|
|
@@ -50,21 +50,21 @@ jobs: | |
| key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
|
||
| - name: Check that workflows are up to date | ||
| run: sbt ++${{ matrix.scala }} githubWorkflowCheck | ||
| run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' | ||
|
|
||
| - name: Build project (Scala 2) | ||
| if: matrix.scala == '2.12.13' || matrix.scala == '2.13.5' | ||
| run: sbt ++${{ matrix.scala }} validateJVM validateJS | ||
| if: matrix.scala == '2.12.14' || matrix.scala == '2.13.6' | ||
| run: sbt --client '++${{ matrix.scala }}; validateJVM; validateJS' | ||
|
|
||
| - name: Build project (Scala 3) | ||
| if: matrix.scala == '3.0.0' | ||
| run: sbt ++${{ matrix.scala }} validateJVM30 validateJS30 | ||
| if: matrix.scala == '3.0.1' | ||
| run: sbt --client '++${{ matrix.scala }}; validateJVM30; validateJS30' | ||
|
|
||
| - name: Codecov | ||
| uses: codecov/codecov-action@v1 | ||
|
|
||
| - name: Compress target directories | ||
| run: tar cf targets.tar modules/jsonpath/jvm/target modules/shapeless/js/target target modules/docs/target modules/pureconfig/jvm/target modules/core/js/target modules/core/jvm/target modules/scodec/jvm/target modules/scodec/js/target modules/shapeless/jvm/target modules/cats/js/target modules/cats/jvm/target modules/eval/jvm/target modules/scopt/jvm/target modules/scalaz/jvm/target modules/scalacheck/jvm/target modules/scalacheck/js/target modules/benchmark/target project/target | ||
| run: tar cf targets.tar modules/jsonpath/jvm/target modules/shapeless/js/target target modules/scalaxml/jvm/target modules/docs/target modules/pureconfig/jvm/target modules/core/js/target modules/core/jvm/target modules/scodec/jvm/target modules/scodec/js/target modules/shapeless/jvm/target modules/cats/js/target modules/cats/jvm/target modules/eval/jvm/target modules/scopt/jvm/target modules/scalaz/jvm/target modules/scalacheck/jvm/target modules/scalacheck/js/target modules/benchmark/target project/target | ||
|
|
||
| - name: Upload target directories | ||
| uses: actions/upload-artifact@v2 | ||
|
|
@@ -79,7 +79,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.12.13] | ||
| scala: [2.12.14] | ||
| java: [[email protected]] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
|
|
@@ -89,7 +89,7 @@ jobs: | |
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v12 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
|
|
@@ -105,32 +105,32 @@ jobs: | |
| ~/Library/Caches/Coursier/v1 | ||
| key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
|
||
| - name: Download target directories (2.12.13) | ||
| - name: Download target directories (2.12.14) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }} | ||
| name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }} | ||
|
|
||
| - name: Inflate target directories (2.12.13) | ||
| - name: Inflate target directories (2.12.14) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
| - name: Download target directories (2.13.5) | ||
| - name: Download target directories (2.13.6) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }} | ||
| name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }} | ||
|
|
||
| - name: Inflate target directories (2.13.5) | ||
| - name: Inflate target directories (2.13.6) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
| - name: Download target directories (3.0.0) | ||
| - name: Download target directories (3.0.1) | ||
| uses: actions/download-artifact@v2 | ||
| with: | ||
| name: target-${{ matrix.os }}-3.0.0-${{ matrix.java }} | ||
| name: target-${{ matrix.os }}-3.0.1-${{ matrix.java }} | ||
|
|
||
| - name: Inflate target directories (3.0.0) | ||
| - name: Inflate target directories (3.0.1) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,9 +10,9 @@ pull_request_rules: | |
| - name: automatically merge scala-steward's PRs | ||
| conditions: | ||
| - author=scala-steward | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.13, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.5, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 3.0.0, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.12.14, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 2.13.6, [email protected]) | ||
| - status-success=Build and Test (ubuntu-latest, 3.0.1, [email protected]) | ||
| - body~=labels:.*semver-patch | ||
| actions: | ||
| merge: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,18 +10,18 @@ val gitHubOwner = "fthomas" | |
| val gitPubUrl = s"https://github.com/$gitHubOwner/$projectName.git" | ||
| val gitDevUrl = s"[email protected]:$gitHubOwner/$projectName.git" | ||
|
|
||
| val Scala_2_12 = "2.12.13" | ||
| val Scala_2_13 = "2.13.5" | ||
| val Scala_3 = "3.0.0" | ||
| val Scala_2_12 = "2.12.14" | ||
| val Scala_2_13 = "2.13.6" | ||
| val Scala_3 = "3.0.1" | ||
|
|
||
| val catsVersion = "2.6.1" | ||
| val jsonpathVersion = "2.4.0" | ||
| val jsonpathVersion = "2.6.0" | ||
| val macroParadiseVersion = "2.1.1" | ||
| val pureconfigVersion = "0.15.0" | ||
| val pureconfigVersion = "0.16.0" | ||
| val shapelessVersion = "2.3.7" | ||
| val scalaCheckVersion = "1.15.4" | ||
| val scalaXmlVersion = "2.0.0" | ||
| val scalazVersion = "7.3.3" | ||
| val scalazVersion = "7.3.4" | ||
| val scodecVersion = "1.11.8" | ||
| val scoptVersion = "4.0.1" | ||
|
|
||
|
|
@@ -290,7 +290,8 @@ lazy val shapelessJS = shapeless.js | |
| lazy val scalaxml = myCrossProject("scalaxml") | ||
| .dependsOn(core % "compile->compile;test->test") | ||
| .settings( | ||
| libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion | ||
| libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % scalaXmlVersion, | ||
| libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" | ||
| ) | ||
|
|
||
| lazy val scalaxmlJVM = scalaxml.jvm | ||
|
|
@@ -364,39 +365,29 @@ def moduleJvmSettings(name: String): Seq[Def.Setting[_]] = | |
| }, | ||
| mimaBinaryIssueFilters ++= { | ||
| import com.typesafe.tools.mima.core._ | ||
| import com.typesafe.tools.mima.core.ProblemFilters.exclude | ||
| Seq( | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]( | ||
| "eu.timepit.refined.api.RefType.unsafeWrapM" | ||
| ), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]( | ||
| "eu.timepit.refined.api.RefType.unsafeRewrapM" | ||
| ), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]( | ||
| "eu.timepit.refined.api.RefType.refineMF" | ||
| ), | ||
| ProblemFilters.exclude[MissingClassProblem]( | ||
| "eu.timepit.refined.internal.RefineMFullyApplied" | ||
| ), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$ConstructorNames"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$ConstructorNames$"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$FieldNames"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$FieldNames$"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$Subtype"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$Subtype$"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$Supertype"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.generic$Supertype$"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.string$Xml$"), | ||
| ProblemFilters.exclude[MissingClassProblem]("eu.timepit.refined.string$Xml"), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]( | ||
| "eu.timepit.refined.predicates.StringPredicates.Xml" | ||
| ), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]("eu.timepit.refined.predicates.all.Xml"), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]( | ||
| "eu.timepit.refined.predicates.string.Xml" | ||
| ), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]("eu.timepit.refined.util.string.xml"), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.Max.findValid"), | ||
| ProblemFilters.exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.Min.findValid") | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.Max.findValid"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.Min.findValid"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.RefType.unsafeWrapM"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.RefType.unsafeRewrapM"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.api.RefType.refineMF"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.predicates.StringPredicates.Xml"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.predicates.all.Xml"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.predicates.string.Xml"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.string.xmlNonEmptyInference"), | ||
| exclude[DirectMissingMethodProblem]("eu.timepit.refined.util.string.xml"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$ConstructorNames"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$ConstructorNames$"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$FieldNames"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$FieldNames$"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$Subtype"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$Subtype$"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$Supertype"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.generic$Supertype$"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.internal.RefineMFullyApplied"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.string$Xml$"), | ||
| exclude[MissingClassProblem]("eu.timepit.refined.string$Xml") | ||
| ) | ||
| } | ||
| ) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
modules/core/shared/src/main/scala-3.0+/eu/timepit/refined/api/Refined.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.