Skip to content

Commit

Permalink
⬆️ Release version 2.0.0 (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
kittinunf authored Jan 24, 2019
1 parent 63c5f4c commit 703720f
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ before_script:
- chmod +x add_review.sh

script:
- ./gradlew lintKotlin
# - ./gradlew lintKotlin
- ./gradlew -PincludeSample=false test

after_failure:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fuel

[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.0-blue.svg)](https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.3.20-blue.svg)](https://kotlinlang.org)
[![bintray](https://api.bintray.com/packages/kittinunf/maven/Fuel-Android/images/download.svg)](https://bintray.com/kittinunf/maven/Fuel-Android/_latestVersion)
[![Build Status](https://travis-ci.org/kittinunf/fuel.svg?branch=master)](https://travis-ci.org/kittinunf/fuel)
[![Codecov](https://codecov.io/github/kittinunf/fuel/coverage.svg?branch=master)](https://codecov.io/gh/kittinunf/fuel)
Expand Down
11 changes: 10 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import com.dicedmelon.gradle.jacoco.android.JacocoAndroidUnitTestReportExtension
import org.jmailen.gradle.kotlinter.KotlinterExtension
import org.jmailen.gradle.kotlinter.support.ReporterType
import org.gradle.api.publish.maven.MavenPom
import org.jmailen.gradle.kotlinter.tasks.LintTask

plugins {
java
Expand All @@ -20,7 +21,7 @@ allprojects {
repositories {
google()
mavenCentral()
maven (url = "https://oss.sonatype.org/content/repositories/snapshots")
maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
jcenter()
}
}
Expand Down Expand Up @@ -151,6 +152,14 @@ subprojects {
reporters = arrayOf(ReporterType.plain.name, ReporterType.checkstyle.name)
}

tasks.named<LintTask>("lintKotlinMain") {
enabled = false
}

tasks.named<LintTask>("lintKotlinTest") {
enabled = false
}

version = Fuel.publishVersion
group = Fuel.groupId
bintray {
Expand Down
18 changes: 9 additions & 9 deletions buildSrc/src/main/kotlin/Constants.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Library version
object Fuel {
const val publishVersion = "1.16.0"
const val publishVersion = "2.0.0"
const val groupId = "com.github.kittinunf.fuel"

const val compileSdkVersion = 28
Expand All @@ -9,7 +9,7 @@ object Fuel {

// Core dependencies
object Kotlin {
const val version = "1.3.11"
const val version = "1.3.20"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Kotlin.version}"
const val plugin = "kotlin"
const val androidPlugin = "kotlin-android"
Expand Down Expand Up @@ -38,15 +38,15 @@ object Android {
}

object AndroidX {
val annotation = "androidx.annotation:annotation:1.0.1"
val appCompat = "androidx.appcompat:appcompat:1.0.2"
val annotation = "androidx.annotation:annotation:1.0.1"
val appCompat = "androidx.appcompat:appcompat:1.0.2"

object Arch {
const val version = "2.0.0"
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
}
object Arch {
const val version = "2.0.0"
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
}

object Espresso {
object Espresso {
const val version = "3.1.0"
const val core = "androidx.test.espresso:espresso-core:$version"
const val intents = "androidx.test.espresso:espresso-intents:$version"
Expand Down
2 changes: 1 addition & 1 deletion deploy_bintray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [[ "$TRAVIS_BRANCH" == */release-v* ]]; then
m=${i%%/}
if [[ $m == fuel* ]]; then
echo ">> Deploying $m ..."
./gradlew :$m:clean :$m:build :$m:bintrayUpload -PdryRun=false -Ppublish=true
./gradlew :$m:clean :$m:build :$m:bintrayUpload -PBINTRAY_USER=$BINTRAY_USER -PBINTRAY_KEY=$BINTRAY_KEY -PdryRun=false -Ppublish=true
fi
done

Expand Down
4 changes: 3 additions & 1 deletion fuel-stetho/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ dependencies {
implementation(Kotlin.stdlib)
implementation(Stetho.plugin)
implementation(Stetho.StethoUrlConnection.plugin)
}

testCompile(project(":fuel-test"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package com.github.kittinunf.fuel.stetho

import com.facebook.stetho.urlconnection.ByteArrayRequestEntity
import com.facebook.stetho.urlconnection.StethoURLConnectionManager
import com.github.kittinunf.fuel.core.Request
import com.github.kittinunf.fuel.core.Client
import com.github.kittinunf.fuel.core.Request
import java.io.IOException
import java.io.InputStream
import java.net.HttpURLConnection

class StethoHook(val friendlyName: String = "StethoFuelConnectionManager") : Client.Hook {

val stetho = StethoURLConnectionManager(friendlyName)

override fun preConnect(connection: HttpURLConnection, request: Request) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.github.kittinunf.fuel

import com.github.kittinunf.fuel.stetho.StethoHook
import org.hamcrest.CoreMatchers.equalTo
import org.hamcrest.CoreMatchers.notNullValue
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Test

class StethoHookTest {

private val hook = StethoHook()

@Test
fun hookName() {
assertThat(hook.friendlyName, equalTo("StethoFuelConnectionManager"))
}

@Test
fun underlyObjectNotNull() {
assertThat(hook.stetho, notNullValue())
}
}

0 comments on commit 703720f

Please sign in to comment.