diff --git a/build.sbt b/build.sbt index 4fba95a..610652a 100644 --- a/build.sbt +++ b/build.sbt @@ -9,15 +9,28 @@ licenses += ("Apache-2.0", url("http://opensource.org/licenses/Apache-2.0")) scalaVersion := "2.12.8" +githubOwner := "openlawteam" + +githubRepository := "eth-propeller-scala" + +githubTokenSource := TokenSource.GitConfig("github.token") + +// credentials += +// Credentials( +// "GitHub Package Registry", +// "maven.pkg.github.com", +// TokenSource.GitConfig("github.username"), +// TokenSource.GitConfig("github.token")) + resolvers ++= Seq( - "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository", + "Github Packages" at "https://maven.pkg.github.com/openlawteam/eth-propeller-core", + // "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository", "java-ipfs-api-mvn-repo" at "https://raw.github.com/pascr/java-ipfs-api/mvn-repo/", - "adridadou-bintray" at "https://dl.bintray.com/cubefriendly/maven/", - "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases") + ) // Change this to another test framework if you prefer libraryDependencies ++= Seq( - "org.adridadou" % "eth-propeller-core" % "0.42", + "org.adridadou" % "eth-propeller-core" % "0.59-SNAPSHOT", "io.reactivex" %% "rxscala" % "0.26.5", "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0", //Test libs @@ -26,11 +39,6 @@ libraryDependencies ++= Seq( ) fork in run := true - releaseCrossBuild := true - -crossScalaVersions := Seq("2.11.8", "2.12.7") - -publishTo := Some("Bintray" at "https://api.bintray.com/maven/cubefriendly/maven/eth-propeller-scala") - -credentials += Credentials(Path.userHome / ".ivy2" / ".credentials") +releaseIgnoreUntrackedFiles := true +crossScalaVersions := Seq("2.11.8", "2.12.7") \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 57a9711..2d66c64 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7") - -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1") - -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4") \ No newline at end of file +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4") +addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") diff --git a/src/main/scala/org/adridadou/propeller/scala/ScalaFutureConverter.scala b/src/main/scala/org/adridadou/propeller/scala/ScalaFutureConverter.scala index eb4f957..b199eba 100644 --- a/src/main/scala/org/adridadou/propeller/scala/ScalaFutureConverter.scala +++ b/src/main/scala/org/adridadou/propeller/scala/ScalaFutureConverter.scala @@ -26,7 +26,7 @@ class ScalaFutureConverter() extends FutureConverter{ override def isPayableTypeWithDetails(cls: Class[_]): Boolean = classOf[ScalaEthPayableCall[_]].equals(cls) - override def convertWithDetails(details: CallDetails, futureResult: CompletableFuture[_]): ScalaEthCall[_] = ScalaEthCall(new EthCall(details.getTxHash, futureResult), this ) + override def convertWithDetails(details: CallDetails, futureResult: CompletableFuture[_]): ScalaEthCall[_] = ScalaEthCall(new EthCall(details.getNonce, details.getGasEstimate, details.getTxHash, futureResult), this) override def getPayableWithDetails(smartContract: SmartContract, arguments: Array[AnyRef], method: Method): ScalaEthPayableCall[_] = ScalaEthPayableCall(new EthPayableCall(smartContract, method, arguments), this)