Skip to content

Commit b6f027a

Browse files
ashawleyshunjikonishi
authored andcommitted
Fix 2.13 deprecations
1 parent b1d44bb commit b6f027a

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

src/main/scala/codecheck/github/api/GitHubAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class GitHubAPI(token: String, client: Transport, tokenType: String = "token", d
8181
deferred.success(result)
8282
}
8383
}
84-
def onThrowable(t: Throwable) {
84+
def onThrowable(t: Throwable): Unit = {
8585
deferred.failure(t)
8686
}
8787
})

src/main/scala/codecheck/github/api/OAuthAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, clie
6363
case None => deferred.success(AccessToken(json))
6464
}
6565
}
66-
def onThrowable(t: Throwable) {
66+
def onThrowable(t: Throwable): Unit = {
6767
deferred.failure(t)
6868
}
6969
})

src/main/scala/codecheck/github/app/commands/MilestoneCommand.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ class MilestoneCommand(val api: GitHubAPI) extends Command {
182182
List(
183183
m.number,
184184
m.title,
185-
m.open_issues + "/" + (m.open_issues + m.closed_issues),
185+
s"${m.open_issues}/${m.open_issues + m.closed_issues}",
186186
m.due_on.map(_.toString("yyyy-MM-dd")).getOrElse("")
187187
)
188188
}

src/main/scala/codecheck/github/transport/asynchttp19/AsyncHttp19Transport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AsyncHttp19Request(request: AsyncHttpClient#BoundRequestBuilder) extends R
4343
handler.onCompleted(new AsyncHttp19Response(res))
4444
res
4545
}
46-
override def onThrowable(t: Throwable) {
46+
override def onThrowable(t: Throwable): Unit = {
4747
handler.onThrowable(t)
4848
super.onThrowable(t)
4949
}

src/main/scala/codecheck/github/transport/asynchttp20/AsyncHttp20Transport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AsyncHttp20Request(request: BoundRequestBuilder) extends Request {
4343
handler.onCompleted(new AsyncHttp20Response(res))
4444
res
4545
}
46-
override def onThrowable(t: Throwable) {
46+
override def onThrowable(t: Throwable): Unit = {
4747
handler.onThrowable(t)
4848
super.onThrowable(t)
4949
}

src/test/scala/PullRequestOpSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PullRequestOpSpec extends FunSpec with api.Constants {
3333
describe("getPullRequest") {
3434
it("with open PR should succeed") {
3535
val pr = Await.result(api.getPullRequest(otherUser, otherUserRepo, 21L), TIMEOUT)
36-
assert(pr.size >= 0)
36+
assert(pr.nonEmpty)
3737
assert(pr.exists(_.state == IssueState.closed))
3838
assert(pr.exists(_.mergeable == Some(false)))
3939
assert(pr.exists(_.merge_commit_sha.size == shaSize))

src/test/scala/PullRequestReviewOpSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class PullRequestReviewOpSpec extends FunSpec with api.Constants {
2222
describe("getPullRequestReview") {
2323
it("with valid repo should succeed") {
2424
val review = Await.result(api.getPullRequestReview(otherUser, otherUserRepo, 47, 32477105), TIMEOUT)
25-
assert(review.size >= 0)
25+
assert(review.nonEmpty)
2626
assert(review.exists(_.id >= 0))
2727
assert(review.exists(_.state == PullRequestReviewState.approved))
2828
assert(review.exists(_.commit_id.size == shaSize))

src/test/scala/UserOpSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class UserOpSpec extends FunSpec
1515
{
1616
val origin = Await.result(api.getAuthenticatedUser, TIMEOUT)
1717

18-
override def afterAll() {
18+
override def afterAll(): Unit = {
1919
val input = UserInput(
2020
origin.name.orElse(Some("")),
2121
origin.email.orElse(Some("")),

src/test/scala/events/GitHubEventSpec.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
3232
describe("Issue") {
3333
val issue = e.issue
3434
it("should have a number") {
35-
assert(issue.number === 2l)
35+
assert(issue.number === 2L)
3636
}
3737
it("should have a title") {
3838
assert(issue.title === "Spelling error in the README file")
@@ -135,7 +135,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
135135
assert(name === "pull_request")
136136
}
137137
it("should have a number") {
138-
assert(e.number === 1l)
138+
assert(e.number === 1L)
139139
}
140140
it("should have an action") {
141141
assert(e.action === models.PullRequestAction.opened)
@@ -146,7 +146,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
146146
describe("PullRequest") {
147147
val pr = e.pull_request
148148
it("should have a number") {
149-
assert(pr.number === 1l)
149+
assert(pr.number === 1L)
150150
}
151151
it("should have a title") {
152152
assert(pr.title === "Update the README with new information")
@@ -208,7 +208,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
208208
describe("PullRequestReview") {
209209
val review = e.review
210210
it("should have an id") {
211-
assert(review.id === 2626884l)
211+
assert(review.id === 2626884L)
212212
}
213213
it("should have a state") {
214214
assert(review.state === models.PullRequestReviewState.approved)
@@ -224,7 +224,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
224224
describe("PullRequest") {
225225
val pr = e.pull_request
226226
it("should have a number") {
227-
assert(pr.number === 8l)
227+
assert(pr.number === 8L)
228228
}
229229
it("should have a title") {
230230
assert(pr.title === "Add a README description")
@@ -267,7 +267,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
267267
describe("Repository") {
268268
val repo = e.repository
269269
it("should have an id") {
270-
assert(repo.id === 35129377l)
270+
assert(repo.id === 35129377L)
271271
}
272272
it("should have a name") {
273273
assert(repo.name === "public-repo")
@@ -285,7 +285,7 @@ class GitHubEventSpec extends FunSpec with Matchers with Inside
285285
describe("User") {
286286
val user = e.sender
287287
it("should have an id") {
288-
assert(user.id === 6752317l)
288+
assert(user.id === 6752317L)
289289
}
290290
it("should have a login") {
291291
assert(user.login === "baxterthehacker")

0 commit comments

Comments
 (0)