Merge pull request #71 from sys1yagi/fix_test

sys1yagi · web-flow · commit 4cff68a33ae6 · 2018-09-05T22:25:20.000+09:00
Update kotlin.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,7 @@
 buildscript {
-    ext.kotlin_version = '1.2.50'
+    ext.kotlin_version = '1.2.51'
     ext.supportTestVersion = '0.5'
     ext.okhttpVersion = '3.6.0'
-    ext.gradleToolsVersion = '3.1.3'
     ext.rxJavaVersion = '2.0.8'
     ext.gsonVersion = '2.8.0'
 
@@ -11,17 +10,15 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:$gradleToolsVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
     }
 }
 apply plugin: 'kotlin'
 apply plugin: 'maven'
 
 group = "com.sys1yagi"
-version = '1.5.0'
+version = '1.6.0'
 
 allprojects {
     repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/mastodon4j-rx/build.gradle b/mastodon4j-rx/build.gradle
@@ -20,9 +20,6 @@ dependencies {
     testCompile 'org.mockito:mockito-core:2.7.22'
 }
 
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
-
 buildscript {
     repositories {
         mavenCentral()
diff --git a/mastodon4j-rx/src/main/java/com/sys1yagi/mastodon4j/rx/RxAccounts.kt b/mastodon4j-rx/src/main/java/com/sys1yagi/mastodon4j/rx/RxAccounts.kt
@@ -18,7 +18,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val account = accounts.getAccount(accountId).execute()
                 it.onSuccess(account)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -29,7 +29,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val credential = accounts.getVerifyCredentials().execute()
                 it.onSuccess(credential)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -40,7 +40,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val credential = accounts.updateCredential(displayName, note, avatar, header).execute()
                 it.onSuccess(credential)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -51,7 +51,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val followers = accounts.getFollowers(accountId, range).execute()
                 it.onSuccess(followers)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -62,7 +62,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val following = accounts.getFollowing(accountId, range).execute()
                 it.onSuccess(following)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -71,9 +71,9 @@ class RxAccounts(client: MastodonClient) {
     fun getStatuses(accountId: Long, onlyMedia: Boolean, range: Range): Single<Pageable<Status>> {
         return Single.create {
             try {
-                val statuses = accounts.getStatuses(accountId, onlyMedia, range).execute()
+                val statuses = accounts.getStatuses(accountId, onlyMedia, range = range).execute()
                 it.onSuccess(statuses)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -84,7 +84,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postFollow(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -95,7 +95,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postUnFollow(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -106,7 +106,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postBlock(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -117,7 +117,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postUnblock(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -128,7 +128,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postMute(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -139,7 +139,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationship = accounts.postUnmute(accountId).execute()
                 it.onSuccess(relationship)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -150,7 +150,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val relationships = accounts.getRelationships(accountIds).execute()
                 it.onSuccess(relationships)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
@@ -161,7 +161,7 @@ class RxAccounts(client: MastodonClient) {
             try {
                 val accounts = accounts.getAccountSearch(query, limit).execute()
                 it.onSuccess(accounts)
-            } catch(throwable: Throwable) {
+            } catch (throwable: Throwable) {
                 it.onErrorIfNotDisposed(throwable)
             }
         }
diff --git a/mastodon4j/build.gradle b/mastodon4j/build.gradle
@@ -4,10 +4,10 @@ apply plugin: "jacoco"
 apply plugin: 'maven'
 
 group = "com.sys1yagi"
-version = '1.5.0'
+version = '1.6.0'
 
 jacoco {
-    toolVersion = "0.7.9"
+    toolVersion = "0.8.2"
 }
 jacocoTestReport {
     reports {
@@ -35,9 +35,6 @@ dependencies {
     testCompile 'org.mockito:mockito-core:2.7.22'
 }
 
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
-
 buildscript {
     repositories {
         mavenCentral()
diff --git a/wercker.yml b/wercker.yml
@@ -5,12 +5,12 @@ build:
     - script:
       name: mastodon4j test
       code: |
-        ./gradlew mastodon4j:test mastodon4j:jacoco
+        ./gradlew mastodon4j:test mastodon4j:jacocoTestReport
         cp -r ./mastodon4j/build/reports/jacoco/* $WERCKER_REPORT_ARTIFACTS_DIR/
     - script:
       name: mastodon4j-rx test
       code: |
-        ./gradlew mastodon4j-rx:test mastodon4j:jacoco
+        ./gradlew mastodon4j-rx:test
     - script:
       name: upload test result to codecov
       code: |

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@ dependencies {`
`20`	`20`	`testCompile 'org.mockito:mockito-core:2.7.22'`
`21`	`21`	`}`
`22`	`22`
`23`		`-sourceCompatibility = "1.7"`
`24`		`-targetCompatibility = "1.7"`
`25`		`-`
`26`	`23`	`buildscript {`
`27`	`24`	`repositories {`
`28`	`25`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class RxAccounts(client: MastodonClient) {`
`18`	`18`	`try {`
`19`	`19`	`val account = accounts.getAccount(accountId).execute()`
`20`	`20`	`it.onSuccess(account)`
`21`		`- } catch(throwable: Throwable) {`
	`21`	`+ } catch (throwable: Throwable) {`
`22`	`22`	`it.onErrorIfNotDisposed(throwable)`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -29,7 +29,7 @@ class RxAccounts(client: MastodonClient) {`
`29`	`29`	`try {`
`30`	`30`	`val credential = accounts.getVerifyCredentials().execute()`
`31`	`31`	`it.onSuccess(credential)`
`32`		`- } catch(throwable: Throwable) {`
	`32`	`+ } catch (throwable: Throwable) {`
`33`	`33`	`it.onErrorIfNotDisposed(throwable)`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -40,7 +40,7 @@ class RxAccounts(client: MastodonClient) {`
`40`	`40`	`try {`
`41`	`41`	`val credential = accounts.updateCredential(displayName, note, avatar, header).execute()`
`42`	`42`	`it.onSuccess(credential)`
`43`		`- } catch(throwable: Throwable) {`
	`43`	`+ } catch (throwable: Throwable) {`
`44`	`44`	`it.onErrorIfNotDisposed(throwable)`
`45`	`45`	`}`
`46`	`46`	`}`
`@@ -51,7 +51,7 @@ class RxAccounts(client: MastodonClient) {`
`51`	`51`	`try {`
`52`	`52`	`val followers = accounts.getFollowers(accountId, range).execute()`
`53`	`53`	`it.onSuccess(followers)`
`54`		`- } catch(throwable: Throwable) {`
	`54`	`+ } catch (throwable: Throwable) {`
`55`	`55`	`it.onErrorIfNotDisposed(throwable)`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -62,7 +62,7 @@ class RxAccounts(client: MastodonClient) {`
`62`	`62`	`try {`
`63`	`63`	`val following = accounts.getFollowing(accountId, range).execute()`
`64`	`64`	`it.onSuccess(following)`
`65`		`- } catch(throwable: Throwable) {`
	`65`	`+ } catch (throwable: Throwable) {`
`66`	`66`	`it.onErrorIfNotDisposed(throwable)`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -71,9 +71,9 @@ class RxAccounts(client: MastodonClient) {`
`71`	`71`	`fun getStatuses(accountId: Long, onlyMedia: Boolean, range: Range): Single<Pageable<Status>> {`
`72`	`72`	`return Single.create {`
`73`	`73`	`try {`
`74`		`- val statuses = accounts.getStatuses(accountId, onlyMedia, range).execute()`
	`74`	`+ val statuses = accounts.getStatuses(accountId, onlyMedia, range = range).execute()`
`75`	`75`	`it.onSuccess(statuses)`
`76`		`- } catch(throwable: Throwable) {`
	`76`	`+ } catch (throwable: Throwable) {`
`77`	`77`	`it.onErrorIfNotDisposed(throwable)`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -84,7 +84,7 @@ class RxAccounts(client: MastodonClient) {`
`84`	`84`	`try {`
`85`	`85`	`val relationship = accounts.postFollow(accountId).execute()`
`86`	`86`	`it.onSuccess(relationship)`
`87`		`- } catch(throwable: Throwable) {`
	`87`	`+ } catch (throwable: Throwable) {`
`88`	`88`	`it.onErrorIfNotDisposed(throwable)`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -95,7 +95,7 @@ class RxAccounts(client: MastodonClient) {`
`95`	`95`	`try {`
`96`	`96`	`val relationship = accounts.postUnFollow(accountId).execute()`
`97`	`97`	`it.onSuccess(relationship)`
`98`		`- } catch(throwable: Throwable) {`
	`98`	`+ } catch (throwable: Throwable) {`
`99`	`99`	`it.onErrorIfNotDisposed(throwable)`
`100`	`100`	`}`
`101`	`101`	`}`
`@@ -106,7 +106,7 @@ class RxAccounts(client: MastodonClient) {`
`106`	`106`	`try {`
`107`	`107`	`val relationship = accounts.postBlock(accountId).execute()`
`108`	`108`	`it.onSuccess(relationship)`
`109`		`- } catch(throwable: Throwable) {`
	`109`	`+ } catch (throwable: Throwable) {`
`110`	`110`	`it.onErrorIfNotDisposed(throwable)`
`111`	`111`	`}`
`112`	`112`	`}`
`@@ -117,7 +117,7 @@ class RxAccounts(client: MastodonClient) {`
`117`	`117`	`try {`
`118`	`118`	`val relationship = accounts.postUnblock(accountId).execute()`
`119`	`119`	`it.onSuccess(relationship)`
`120`		`- } catch(throwable: Throwable) {`
	`120`	`+ } catch (throwable: Throwable) {`
`121`	`121`	`it.onErrorIfNotDisposed(throwable)`
`122`	`122`	`}`
`123`	`123`	`}`
`@@ -128,7 +128,7 @@ class RxAccounts(client: MastodonClient) {`
`128`	`128`	`try {`
`129`	`129`	`val relationship = accounts.postMute(accountId).execute()`
`130`	`130`	`it.onSuccess(relationship)`
`131`		`- } catch(throwable: Throwable) {`
	`131`	`+ } catch (throwable: Throwable) {`
`132`	`132`	`it.onErrorIfNotDisposed(throwable)`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -139,7 +139,7 @@ class RxAccounts(client: MastodonClient) {`
`139`	`139`	`try {`
`140`	`140`	`val relationship = accounts.postUnmute(accountId).execute()`
`141`	`141`	`it.onSuccess(relationship)`
`142`		`- } catch(throwable: Throwable) {`
	`142`	`+ } catch (throwable: Throwable) {`
`143`	`143`	`it.onErrorIfNotDisposed(throwable)`
`144`	`144`	`}`
`145`	`145`	`}`
`@@ -150,7 +150,7 @@ class RxAccounts(client: MastodonClient) {`
`150`	`150`	`try {`
`151`	`151`	`val relationships = accounts.getRelationships(accountIds).execute()`
`152`	`152`	`it.onSuccess(relationships)`
`153`		`- } catch(throwable: Throwable) {`
	`153`	`+ } catch (throwable: Throwable) {`
`154`	`154`	`it.onErrorIfNotDisposed(throwable)`
`155`	`155`	`}`
`156`	`156`	`}`
`@@ -161,7 +161,7 @@ class RxAccounts(client: MastodonClient) {`
`161`	`161`	`try {`
`162`	`162`	`val accounts = accounts.getAccountSearch(query, limit).execute()`
`163`	`163`	`it.onSuccess(accounts)`
`164`		`- } catch(throwable: Throwable) {`
	`164`	`+ } catch (throwable: Throwable) {`
`165`	`165`	`it.onErrorIfNotDisposed(throwable)`
`166`	`166`	`}`
`167`	`167`	`}`