From bab9b7607ecd37fe67e5aaab21f94343dec9064e Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Tue, 5 Feb 2019 11:29:55 -0600 Subject: [PATCH] Move unsigned support to samples --- build.gradle | 4 ++-- .../okio => samples/src/main/java/okio/samples}/-Unsigned.kt | 5 ++++- .../src/test/java/okio/samples}/UnsignedTest.kt | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) rename {okio/jvm/src/main/java/okio => samples/src/main/java/okio/samples}/-Unsigned.kt (99%) rename {okio/jvm/src/test/java/okio => samples/src/test/java/okio/samples}/UnsignedTest.kt (99%) diff --git a/build.gradle b/build.gradle index 3619d101dc..44c317fea8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { 'assertj': '1.7.0', 'shadowPlugin': '4.0.4', 'nodePlugin': '1.2.0', - 'ktlintPlugin': '5.1.0', + 'ktlintPlugin': '7.1.0', ] ext.deps = [ @@ -43,7 +43,7 @@ buildscript { 'dokka': "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}", 'shadow': "com.github.jengelman.gradle.plugins:shadow:${versions.shadowPlugin}", 'node': "com.moowork.gradle:gradle-node-plugin:${versions.nodePlugin}", - 'ktlint': "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:${versions.ktlintPlugin}", + 'ktlint': "org.jlleitschuh.gradle:ktlint-gradle:${versions.ktlintPlugin}", 'test': [ 'junit': "junit:junit:${versions.junit}", 'assertj': "org.assertj:assertj-core:${versions.assertj}", diff --git a/okio/jvm/src/main/java/okio/-Unsigned.kt b/samples/src/main/java/okio/samples/-Unsigned.kt similarity index 99% rename from okio/jvm/src/main/java/okio/-Unsigned.kt rename to samples/src/main/java/okio/samples/-Unsigned.kt index 9a12909958..f9e81aaf1b 100644 --- a/okio/jvm/src/main/java/okio/-Unsigned.kt +++ b/samples/src/main/java/okio/samples/-Unsigned.kt @@ -17,8 +17,11 @@ @file:JvmName("-Unsigned") @file:Suppress("NOTHING_TO_INLINE") // Syntactic sugar. -package okio +package okio.samples +import okio.BufferedSink +import okio.BufferedSource +import okio.JvmName import java.io.IOException /** Writes a unsigned byte to this sink. */ diff --git a/okio/jvm/src/test/java/okio/UnsignedTest.kt b/samples/src/test/java/okio/samples/UnsignedTest.kt similarity index 99% rename from okio/jvm/src/test/java/okio/UnsignedTest.kt rename to samples/src/test/java/okio/samples/UnsignedTest.kt index 621ea777b7..6d4ad4a06c 100644 --- a/okio/jvm/src/test/java/okio/UnsignedTest.kt +++ b/samples/src/test/java/okio/samples/UnsignedTest.kt @@ -16,8 +16,9 @@ @file:UseExperimental(ExperimentalUnsignedTypes::class) -package okio +package okio.samples +import okio.Buffer import org.junit.Test import kotlin.test.assertEquals