Skip to content

Commit f6f1191

Browse files
Upgrades Project (#91)
* Fixes scalajs tests * Excludes scalaz module from code coverage * Upgrades sbt-org-policies plugin version * Releases new patch version * Adds jvmopts
1 parent 3e3724b commit f6f1191

31 files changed

Lines changed: 218 additions & 134 deletions

.java-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.8

.jvmopts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Cats jvmopts see https://weblogs.java.net/blog/kcpeppe/archive/2013/12/11/case-study-jvm-hotspot-flags
2+
-Dfile.encoding=UTF8
3+
-Xms2G
4+
-Xmx2G
5+
-XX:MaxMetaspaceSize=512M
6+
-XX:ReservedCodeCacheSize=128M
7+
-XX:+TieredCompilation
8+
-XX:-UseGCOverheadLimit
9+
# effectively adds GC to Perm space
10+
-XX:+UseConcMarkSweepGC
11+
-XX:+CMSClassUnloadingEnabled
12+
# must be enabled for CMSClassUnloadingEnabled to work

.travis.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
language: scala
2+
23
scala:
3-
- 2.10.6
4-
- 2.11.8
5-
- 2.12.1
4+
- 2.10.6
5+
- 2.11.11
6+
- 2.12.2
7+
68
jdk:
7-
- oraclejdk8
9+
- oraclejdk8
10+
811
before_install:
9-
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
10-
openssl aes-256-cbc -K $encrypted_88322e86f6b6_key -iv $encrypted_88322e86f6b6_iv -in secring.gpg.enc -out secring.gpg -d;
11-
fi
12+
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
13+
openssl aes-256-cbc -K $encrypted_88322e86f6b6_key -iv $encrypted_88322e86f6b6_iv -in secring.gpg.enc -out secring.gpg -d;
14+
fi
15+
1216
script:
13-
- sbt ++$TRAVIS_SCALA_VERSION clean coverage test
14-
- sbt ++$TRAVIS_SCALA_VERSION 'docs/tut'
17+
- sbt ++$TRAVIS_SCALA_VERSION orgScriptCI
18+
1519
after_success:
16-
- sbt ++$TRAVIS_SCALA_VERSION coverageReport
1720
- bash <(curl -s https://codecov.io/bash) -t 744f05ba-f905-4468-aef1-f5016fc2909d
1821
- sbt ++$TRAVIS_SCALA_VERSION orgAfterCISuccess

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github4s
1+
Github4s
22
Copyright (c) 2016-2017 47 Degrees. All rights reserved.
33

44
Licensed under Apache License. See [LICENSE](LICENSE) for terms.

README.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
[comment]: # (Start Badges)
2+
13
[![Build Status](https://travis-ci.org/47deg/github4s.svg?branch=master)](https://travis-ci.org/47deg/github4s)
24
[![codecov.io](http://codecov.io/github/47deg/github4s/coverage.svg?branch=master)](http://codecov.io/github/47deg/github4s?branch=master)
35

6+
[comment]: # (End Badges)
7+
48
Github4s
59
=============
610

@@ -10,13 +14,27 @@ Github4s
1014

1115
To get started with SBT, simply add the following to your build.sbt file:
1216

13-
```
17+
[comment]: # (Start Replace)
18+
19+
```scala
1420
libraryDependencies += "com.47deg" %% "github4s" % "0.14.3"
1521
```
1622

23+
[comment]: # (End Replace)
24+
25+
## Github4s in the wild
26+
27+
If you wish to add your library here please consider a PR to include it in the list below.
28+
29+
★ | ★ | ★
30+
--- | --- | ---
31+
![scala-exercises](https://www.scala-exercises.org/assets/images/navbar_brand.svg) | [**scala-exercises**](https://www.scala-exercises.org/) | Scala Exercises is an Open Source project for learning different technologies based in the Scala Programming Language.
32+
33+
[comment]: # (Start Copyright)
1734
# Copyright
1835

19-
github4s is designed and developed by 47 Degrees
36+
Github4s is designed and developed by 47 Degrees
2037

2138
Copyright (C) 2016-2017 47 Degrees. <http://47deg.com>
22-
39+
40+
[comment]: # (End Copyright)

build.sbt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ lazy val root = (project in file("."))
66
.dependsOn(github4sJVM, github4sJS, scalaz, docs)
77
.aggregate(github4sJVM, github4sJS, scalaz, docs)
88
.settings(noPublishSettings: _*)
9-
.settings(coverageFailOnMinimum := false)
109

1110
lazy val github4s = (crossProject in file("github4s"))
1211
.settings(moduleName := "github4s")
@@ -18,14 +17,15 @@ lazy val github4s = (crossProject in file("github4s"))
1817
"token" -> sys.env.getOrElse("GITHUB4S_ACCESS_TOKEN", "")),
1918
buildInfoPackage := "github4s"
2019
)
21-
.settings(commonDeps: _*)
20+
.crossDepSettings(commonCrossDeps: _*)
21+
.settings(standardCommonDeps: _*)
2222
.jvmSettings(jvmDeps: _*)
23+
.jsSettings(jsDeps: _*)
2324
.jsSettings(sharedJsSettings: _*)
2425
.jsSettings(testSettings: _*)
25-
.jsSettings(jsDeps: _*)
2626

2727
lazy val github4sJVM = github4s.jvm
28-
lazy val github4sJS = github4s.js.settings(coverageFailOnMinimum := false)
28+
lazy val github4sJS = github4s.js
2929

3030
lazy val docs = (project in file("docs"))
3131
.dependsOn(scalaz)
@@ -38,5 +38,4 @@ lazy val docs = (project in file("docs"))
3838
lazy val scalaz = (project in file("scalaz"))
3939
.settings(moduleName := "github4s-scalaz")
4040
.settings(scalazDependencies: _*)
41-
.settings(coverageFailOnMinimum := false)
4241
.dependsOn(github4sJVM)

docs/src/main/tut/index.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Github4s is a GitHub API wrapper written in Scala.
1414

1515
To get started with SBT, simply add the following to your build.sbt file:
1616

17+
[comment]: # (Start Replace)
18+
19+
```scala
20+
libraryDependencies += "com.47deg" %% "github4s" % "0.14.3"
1721
```
18-
libraryDependencies += "com.47deg" %% "github4s" % "0.12.1"
19-
```
22+
23+
[comment]: # (End Replace)

github4s/js/src/main/scala/github4s/HttpRequestBuilderExtensionJS.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import fr.hmil.roshttp._
2323
import fr.hmil.roshttp.body.BulkBodyPart
2424
import fr.hmil.roshttp.response.SimpleHttpResponse
2525
import fr.hmil.roshttp.util.HeaderMap
26-
import github4s.GithubResponses.{GHResponse, GHResult, JsonParsingException, UnexpectedException}
26+
import github4s.GithubResponses._
2727
import github4s.HttpClient.HttpCode400
2828
import io.circe.Decoder
2929
import io.circe.parser._

github4s/js/src/test/scala/github4s/utils/integration/GHAuthSpec.scala renamed to github4s/js/src/test/scala/github4s/integration/GHAuthSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import github4s.Github._
2020
import github4s.Github
2121
import github4s.utils.TestUtils
2222
import org.scalatest._
23-
import fr.hmil.roshttp.response.SimpleHttpResponse
2423
import github4s.free.domain.Authorize
2524
import github4s.js.Implicits._
26-
import scala.concurrent.Future
25+
26+
import scala.concurrent.ExecutionContext
2727

2828
class GHAuthSpec extends AsyncFlatSpec with Matchers with TestUtils {
2929

30-
override implicit val executionContext =
30+
override implicit val executionContext: ExecutionContext =
3131
scala.concurrent.ExecutionContext.Implicits.global
3232

3333
"Auth >> NewAuth" should "return error on Left when invalid credential is provided" in {

github4s/js/src/test/scala/github4s/utils/integration/GHGistsSpec.scala renamed to github4s/js/src/test/scala/github4s/integration/GHGistsSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ import github4s.Github._
2020
import github4s.Github
2121
import github4s.utils.TestUtils
2222
import org.scalatest._
23-
import fr.hmil.roshttp.response.SimpleHttpResponse
2423
import github4s.free.domain.{Gist, GistFile}
2524
import github4s.js.Implicits._
26-
import scala.concurrent.Future
25+
26+
import scala.concurrent.ExecutionContext
2727

2828
class GHGistsSpec extends AsyncFlatSpec with Matchers with TestUtils {
2929

30-
override implicit val executionContext =
30+
override implicit val executionContext: ExecutionContext =
3131
scala.concurrent.ExecutionContext.Implicits.global
3232

3333
"Gists >> Post" should "return the provided gist" in {

0 commit comments

Comments
 (0)