diff --git a/.travis.yml b/.travis.yml index 8433ddf..4b57ecb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,14 +6,11 @@ android: - tools - platform-tools - build-tools-28.0.3 - - android-28 + - android-29 - extra-android-m2repository - licenses: - - android-sdk-license-.+ - before_script: - - yes | sdkmanager "platforms;android-28" + - yes | sdkmanager "platforms;android-29" script: - ./gradlew clean build diff --git a/README.md b/README.md index 3ced2df..67a7c02 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation 'com.github.mrmike:ok2curl:0.5.0' + implementation 'com.github.mrmike:ok2curl:0.6.0' } ``` diff --git a/build.gradle b/build.gradle index 24e22b3..08f8c59 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea..87b738c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b7768ce..4c5803d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Feb 27 20:07:24 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..af6708f 100755 --- a/gradlew +++ b/gradlew @@ -28,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index e95643d..0f8d593 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/ok2curl/build.gradle b/ok2curl/build.gradle index 5b20178..ac254fc 100644 --- a/ok2curl/build.gradle +++ b/ok2curl/build.gradle @@ -4,26 +4,26 @@ apply plugin: 'maven-publish' apply plugin: 'com.jfrog.bintray' group='com.github.mrmike' -version='0.5.0' +version='0.6.0' targetCompatibility = '1.8' sourceCompatibility = '1.8' dependencies { - compile 'com.squareup.okhttp3:okhttp:3.13.1' + implementation 'com.squareup.okhttp3:okhttp:4.6.0' - testCompile 'junit:junit:4.12' - testCompile 'org.mockito:mockito-core:2.23.0' - testCompile 'com.squareup.okhttp3:mockwebserver:3.13.1' + testImplementation 'junit:junit:4.12' + testImplementation 'org.mockito:mockito-core:2.23.0' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.2.0' } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } diff --git a/sample/build.gradle b/sample/build.gradle index 4c7f218..6084ebc 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { applicationId "com.moczul.sample" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 versionName "1.0" } @@ -32,19 +32,20 @@ dependencies { implementation project(':ok2curl') /** - * implementation 'com.github.mrmike:ok2curl:0.5.0' + * implementation 'com.github.mrmike:ok2curl:0.6.0' */ /** * Ok2Curl is packed with the latest version of OkHttp. If you already have OkHttp declared in * your dependencies or want to use different version simply add exclude module. * - * implementation ('com.github.mrmike:ok2curl:0.5.0') { + * implementation ('com.github.mrmike:ok2curl:0.6.0') { * exclude module: 'okhttp' * } */ - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:4.6.0' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.23.0'