mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-21 22:21:53 +01:00
Drop support for scalac 2.12.x (#4704)
* Drop support for scalac 2.12.x * Turn logging level OFF * Remove more 2.12.x files
This commit is contained in:
Chris Stewart
GitHub
parent
1758197d58
commit
328e1653a9
8 changed files with 1 additions and 172 deletions
|
|
@ -1,35 +0,0 @@
|
|||
name: Linux 2.12 App, Chain, and Core Tests
|
||||
env:
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
if: "! contains(github.event.pull_request.labels.*.name, 'documentation')"
|
||||
env:
|
||||
PG_STARTUP_WAIT: "60"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Scala
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
java-version: '17'
|
||||
cache: 'sbt'
|
||||
- name: Cache
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.ivy2/cache
|
||||
~/.sbt
|
||||
~/.bitcoin-s/binaries
|
||||
key: ${{ runner.os }}-cache
|
||||
- name: run tests
|
||||
run: sbt ++2.12.15 coverage dbCommonsTest/test chainTest/test chain/coverageReport chain/coverageAggregate chain/coveralls cryptoJVM/test cryptoTestJVM/test cryptoJVM/coverageReport cryptoJVM/coverageAggregate cryptoJVM/coveralls coreTestJVM/test dlcTest/test coreJVM/coverageReport coreJVM/coverageAggregate coreJVM/coveralls secp256k1jni/test zmq/test zmq/coverageReport zmq/coverageAggregate zmq/coveralls appCommonsTest/test appServerTest/test oracleServerTest/test lnurlTest/test
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
name: Linux 2.12 KeyManager, Wallet, and DLC tests
|
||||
env:
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
if: "! contains(github.event.pull_request.labels.*.name, 'documentation')"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Scala
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
java-version: '17'
|
||||
cache: 'sbt'
|
||||
- name: Cache
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.ivy2/cache
|
||||
~/.sbt
|
||||
~/.bitcoin-s/binaries
|
||||
key: ${{ runner.os }}-cache
|
||||
- name: run tests
|
||||
run: sbt ++2.12.15 keyManagerTest/test feeProviderTest/test walletTest/test dlcWalletTest/test dlcOracleTest/test asyncUtilsTestJVM/test asyncUtilsTestJS/test oracleExplorerClient/test
|
||||
33
.github/workflows/Linux_2.12_Node_Tests.yml
vendored
33
.github/workflows/Linux_2.12_Node_Tests.yml
vendored
|
|
@ -1,33 +0,0 @@
|
|||
name: Linux 2.12 Node Tests
|
||||
env:
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
if: "! contains(github.event.pull_request.labels.*.name, 'documentation')"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Scala
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
java-version: '17'
|
||||
cache: 'sbt'
|
||||
- name: Cache
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.ivy2/cache
|
||||
~/.sbt
|
||||
~/.bitcoin-s/binaries
|
||||
key: ${{ runner.os }}-cache
|
||||
- name: run tests
|
||||
run: sbt ++2.12.15 coverage nodeTest/test node/coverageReport node/coverageAggregate node/coveralls dlcNodeTest/test
|
||||
33
.github/workflows/Linux_2.12_RPC_Tests.yml
vendored
33
.github/workflows/Linux_2.12_RPC_Tests.yml
vendored
|
|
@ -1,33 +0,0 @@
|
|||
name: Linux 2.12 bitcoind, eclair, and lnd rpc tests
|
||||
env:
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
if: "! contains(github.event.pull_request.labels.*.name, 'documentation')"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup Scala
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: 'adopt'
|
||||
java-version: '17'
|
||||
cache: 'sbt'
|
||||
- name: Cache
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.ivy2/cache
|
||||
~/.sbt
|
||||
~/.bitcoin-s/binaries
|
||||
key: ${{ runner.os }}-cache
|
||||
- name: run tests
|
||||
run: sbt ++2.12.15 coverage bitcoindRpcTest/test bitcoindRpc/coverageReport bitcoindRpc/coverageAggregate bitcoindRpc/coveralls eclairRpcTest/test eclairRpc/coverageReport eclairRpc/coverageAggregate eclairRpc/coveralls lndRpcTest/test clightningRpcTest/test esploraTest/test
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package org.bitcoins.core
|
||||
|
||||
/** This package provides
|
||||
* compatability functionality
|
||||
* for compiling Scala 2.11, 2.12
|
||||
* and 2.13, ideally without leading
|
||||
* to any compiler warnings in any of
|
||||
* the versions.
|
||||
*/
|
||||
package object compat {
|
||||
|
||||
/** Provides imports that allow converting
|
||||
* Java collections to Scala collections
|
||||
*/
|
||||
val JavaConverters = scala.collection.JavaConverters
|
||||
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
package org.bitcoins.core.util
|
||||
|
||||
trait MapWrapper[K, +T] extends Map[K, T] {
|
||||
protected def wrapped: Map[K, T]
|
||||
override def +[B1 >: T](kv: (K, B1)): Map[K, B1] = wrapped.+(kv)
|
||||
override def get(key: K): Option[T] = wrapped.get(key)
|
||||
override def iterator: Iterator[(K, T)] = wrapped.iterator
|
||||
|
||||
override def updated[V1 >: T](key: K, value: V1): Map[K, V1] =
|
||||
wrapped.updated(key, value)
|
||||
override def -(key: K): Map[K, T] = wrapped.-(key)
|
||||
}
|
||||
|
|
@ -2,14 +2,13 @@ import sbt.Keys.excludeLintKeys
|
|||
|
||||
import scala.util.Properties
|
||||
|
||||
val scala2_12 = "2.12.15"
|
||||
val scala2_13 = "2.13.8"
|
||||
|
||||
ThisBuild / scalafmtOnCompile := !Properties.envOrNone("CI").contains("true")
|
||||
|
||||
ThisBuild / scalaVersion := scala2_13
|
||||
|
||||
ThisBuild / crossScalaVersions := List(scala2_13, scala2_12)
|
||||
ThisBuild / crossScalaVersions := List(scala2_13)
|
||||
|
||||
//https://github.com/sbt/sbt/pull/5153
|
||||
//https://github.com/bitcoin-s/bitcoin-s/pull/2194
|
||||
|
|
|
|||
|
|
@ -5,10 +5,3 @@ name := "bitcoin-s-secp256k1jni"
|
|||
|
||||
//https://www.scala-sbt.org/1.x/docs/Cross-Build.html#Scala-version+specific+source+directory
|
||||
crossPaths := false // drop off Scala suffix from artifact names.
|
||||
|
||||
//sbt documents recommend setting scalaversion to a fixed value
|
||||
//to avoid double publishing
|
||||
//https://www.scala-sbt.org/1.x/docs/Cross-Build.html
|
||||
crossScalaVersions := {
|
||||
List("2.12.13")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue