From e03b81760f78c47901511d51f4995d3f2b15ef66 Mon Sep 17 00:00:00 2001 From: Benoit Quenaudon Date: Fri, 16 Jun 2023 09:13:18 +0200 Subject: [PATCH] The library has shown limitation for kotlin classes with fields --- android-test/build.gradle.kts | 1 - build.gradle.kts | 1 - gradle/libs.versions.toml | 4 ---- okio-fakefilesystem/build.gradle.kts | 13 ------------- okio/build.gradle.kts | 16 ---------------- okio/src/jvmMain/kotlin/okio/DeflaterSink.kt | 2 -- okio/src/jvmMain/kotlin/okio/JvmOkio.kt | 3 --- .../jvmMain/kotlin/okio/NioSystemFileSystem.kt | 2 -- okio/src/jvmMain/kotlin/okio/Path.kt | 5 +---- 9 files changed, 1 insertion(+), 46 deletions(-) diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts index cdda51a5d5..5f9957ba36 100644 --- a/android-test/build.gradle.kts +++ b/android-test/build.gradle.kts @@ -62,7 +62,6 @@ dependencies { coreLibraryDesugaring(libs.android.desugar.jdk.libs) androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.androidx.test.runner) - androidTestImplementation(libs.animalSniffer.annotations) androidTestImplementation(libs.kotlin.test) androidTestImplementation(libs.kotlin.time) androidTestImplementation(libs.test.assertj) diff --git a/build.gradle.kts b/build.gradle.kts index 88769470fe..566ab92840 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,6 @@ plugins { buildscript { dependencies { classpath(libs.android.gradle.plugin) - classpath(libs.animalSniffer.gradle.plugin) classpath(libs.japicmp) classpath(libs.dokka) classpath(libs.shadow) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 853a129178..7d01ce7a4a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,10 +13,6 @@ kotlin-time = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0. jmh-gradle-plugin = { module = "me.champeau.gradle:jmh-gradle-plugin", version = "0.5.3" } jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } -animalSniffer-gradle-plugin = { module = "ru.vyarus:gradle-animalsniffer-plugin", version = "1.7.0" } -animalSniffer-annotations = { module = "org.codehaus.mojo:animal-sniffer-annotations", version = "1.22" } -animalSniffer-android = { module = "net.sf.androidscents.signature:android-api-level-15", version = "4.0.3_r5" } -animalSniffer-java = { module = "org.codehaus.mojo.signature:java17", version = "1.0" } japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version = "0.4.1" } dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.8.20" } shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version = "7.1.2" } diff --git a/okio-fakefilesystem/build.gradle.kts b/okio-fakefilesystem/build.gradle.kts index a824cb8433..94a79be763 100644 --- a/okio-fakefilesystem/build.gradle.kts +++ b/okio-fakefilesystem/build.gradle.kts @@ -1,11 +1,9 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinMultiplatform import com.vanniktech.maven.publish.MavenPublishBaseExtension -import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension plugins { kotlin("multiplatform") - id("ru.vyarus.animalsniffer") id("org.jetbrains.dokka") id("com.vanniktech.maven.publish.base") id("build-support") @@ -65,17 +63,6 @@ tasks { } } -configure { - sourceSets = listOf(project.sourceSets.getByName("main")) -} - -val signature: Configuration by configurations - -dependencies { - signature(variantOf(libs.animalSniffer.android) { artifactType("signature") }) - signature(variantOf(libs.animalSniffer.java) { artifactType("signature") }) -} - configure { configure( KotlinMultiplatform(javadocJar = Dokka("dokkaGfm")) diff --git a/okio/build.gradle.kts b/okio/build.gradle.kts index 1fdc1e1383..6d95af8f29 100644 --- a/okio/build.gradle.kts +++ b/okio/build.gradle.kts @@ -5,11 +5,9 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType import org.jetbrains.kotlin.gradle.plugin.mpp.TestExecutable -import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension plugins { kotlin("multiplatform") - id("ru.vyarus.animalsniffer") id("org.jetbrains.dokka") id("com.vanniktech.maven.publish.base") id("build-support") @@ -101,9 +99,6 @@ kotlin { } val jvmMain by getting { - dependencies { - compileOnly(libs.animalSniffer.annotations) - } } val jvmTest by getting { kotlin.srcDir("src/jvmTest/hashFunctions") @@ -178,17 +173,6 @@ tasks { } } -configure { - sourceSets = listOf(project.sourceSets.getByName("main")) -} - -val signature: Configuration by configurations - -dependencies { - signature(variantOf(libs.animalSniffer.android) { artifactType("signature") }) - signature(variantOf(libs.animalSniffer.java) { artifactType("signature") }) -} - configure { configure( KotlinMultiplatform(javadocJar = Dokka("dokkaGfm")) diff --git a/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt b/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt index 5cac978f65..ff9d46c7d4 100644 --- a/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt +++ b/okio/src/jvmMain/kotlin/okio/DeflaterSink.kt @@ -21,7 +21,6 @@ package okio import java.io.IOException import java.util.zip.Deflater -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement /** * A sink that uses [DEFLATE](http://tools.ietf.org/html/rfc1951) to @@ -75,7 +74,6 @@ internal constructor(private val sink: BufferedSink, private val deflater: Defla } } - @IgnoreJRERequirement private fun deflate(syncFlush: Boolean) { val buffer = sink.buffer while (true) { diff --git a/okio/src/jvmMain/kotlin/okio/JvmOkio.kt b/okio/src/jvmMain/kotlin/okio/JvmOkio.kt index 0a32fb80cd..024f3767a1 100644 --- a/okio/src/jvmMain/kotlin/okio/JvmOkio.kt +++ b/okio/src/jvmMain/kotlin/okio/JvmOkio.kt @@ -37,7 +37,6 @@ import java.util.logging.Logger import javax.crypto.Cipher import javax.crypto.Mac import okio.internal.ResourceFileSystem -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement /** Returns a sink that writes to `out`. */ fun OutputStream.sink(): Sink = OutputStreamSink(this, Timeout()) @@ -183,13 +182,11 @@ fun File.source(): Source = InputStreamSource(inputStream(), Timeout.NONE) /** Returns a source that reads from `path`. */ @Throws(IOException::class) -@IgnoreJRERequirement // Can only be invoked on Java 7+. fun NioPath.sink(vararg options: OpenOption): Sink = Files.newOutputStream(this, *options).sink() /** Returns a sink that writes to `path`. */ @Throws(IOException::class) -@IgnoreJRERequirement // Can only be invoked on Java 7+. fun NioPath.source(vararg options: OpenOption): Source = Files.newInputStream(this, *options).source() diff --git a/okio/src/jvmMain/kotlin/okio/NioSystemFileSystem.kt b/okio/src/jvmMain/kotlin/okio/NioSystemFileSystem.kt index bc2d176772..96e9854950 100644 --- a/okio/src/jvmMain/kotlin/okio/NioSystemFileSystem.kt +++ b/okio/src/jvmMain/kotlin/okio/NioSystemFileSystem.kt @@ -25,13 +25,11 @@ import java.nio.file.StandardCopyOption.REPLACE_EXISTING import java.nio.file.attribute.BasicFileAttributes import java.nio.file.attribute.FileTime import okio.Path.Companion.toOkioPath -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement /** * Extends [JvmSystemFileSystem] for platforms that support `java.nio.files` first introduced in * Java 7 and Android 8.0 (API level 26). */ -@IgnoreJRERequirement // Only used on platforms that support java.nio.file. internal class NioSystemFileSystem : JvmSystemFileSystem() { override fun metadataOrNull(path: Path): FileMetadata? { val nioPath = path.toNioPath() diff --git a/okio/src/jvmMain/kotlin/okio/Path.kt b/okio/src/jvmMain/kotlin/okio/Path.kt index 5f1025b196..e4c98601a6 100644 --- a/okio/src/jvmMain/kotlin/okio/Path.kt +++ b/okio/src/jvmMain/kotlin/okio/Path.kt @@ -36,7 +36,6 @@ import okio.internal.commonSegmentsBytes import okio.internal.commonToPath import okio.internal.commonToString import okio.internal.commonVolumeLetter -import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement actual class Path internal actual constructor( internal actual val bytes: ByteString, @@ -98,8 +97,7 @@ actual class Path internal actual constructor( actual fun normalized(): Path = commonNormalized() fun toFile(): File = File(toString()) - - @IgnoreJRERequirement // Can only be invoked on platforms that have java.nio.file. + // Can only be invoked on platforms that have java.nio.file. fun toNioPath(): NioPath = Paths.get(toString()) actual override fun compareTo(other: Path): Int = commonCompareTo(other) @@ -127,7 +125,6 @@ actual class Path internal actual constructor( @JvmName("get") @JvmStatic @JvmOverloads - @IgnoreJRERequirement // Can only be invoked on platforms that have java.nio.file. fun NioPath.toOkioPath(normalize: Boolean = false): Path = toString().toPath(normalize) } }