Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: erickok/okio-extensions
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1
Choose a base ref
...
head repository: erickok/okio-extensions
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 2, 2020

  1. Copy the full SHA
    42cb777 View commit details
  2. Update okio & kotlin

    Shusshu authored Sep 2, 2020
    Copy the full SHA
    ce9ee3d View commit details
  3. Merge pull request #1 from Shusshu/Shusshu-patch-1

    Update gradle-wrapper.properties
    erickok authored Sep 2, 2020
    Copy the full SHA
    ce38b78 View commit details
  4. Merge pull request #2 from Shusshu/Shusshu-patch-2

    Update okio & kotlin
    erickok authored Sep 2, 2020
    Copy the full SHA
    b7cdc3d View commit details
Showing with 5 additions and 5 deletions.
  1. +4 −4 lib/build.gradle
  2. +1 −1 lib/gradle/wrapper/gradle-wrapper.properties
8 changes: 4 additions & 4 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
group 'nl.nl2312'
version '1.0'
version '1.1'

buildscript {
ext.kotlin_version = '1.2.71'
ext.kotlin_version = '1.4.0'

repositories {
mavenCentral()
@@ -20,7 +20,7 @@ repositories {

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile 'com.squareup.okio:okio:2.1.0'
compile 'com.squareup.okio:okio:2.7.0'

testCompile 'junit:junit:4.12'
testCompile 'com.google.truth:truth:0.42'
@@ -31,4 +31,4 @@ compileKotlin {
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.6"
}
}
2 changes: 1 addition & 1 deletion lib/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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-4.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip