From 46c89534fdccd6d4631a6062f18483c76e4e871b Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 2 Feb 2023 12:50:15 +0800 Subject: [PATCH] Revert "Kotlin Native Jni Stub" This reverts commit 5650ee580fc2cfaf29447a317f4e39dbea8c319f. --- native/.gitignore | 1 - native/build.gradle.kts | 11 ----------- .../kotlin/moe/tarsin/ehviewer/RewriteGif.kt | 13 ------------- settings.gradle | 3 +-- 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 native/.gitignore delete mode 100644 native/build.gradle.kts delete mode 100644 native/src/nativeMain/kotlin/moe/tarsin/ehviewer/RewriteGif.kt diff --git a/native/.gitignore b/native/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/native/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/native/build.gradle.kts b/native/build.gradle.kts deleted file mode 100644 index 4297a8307..000000000 --- a/native/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - kotlin("multiplatform") -} - -kotlin { - androidNativeArm64("native") { - binaries { - sharedLib("ehviewer-kotlin-native") - } - } -} diff --git a/native/src/nativeMain/kotlin/moe/tarsin/ehviewer/RewriteGif.kt b/native/src/nativeMain/kotlin/moe/tarsin/ehviewer/RewriteGif.kt deleted file mode 100644 index dfc76278a..000000000 --- a/native/src/nativeMain/kotlin/moe/tarsin/ehviewer/RewriteGif.kt +++ /dev/null @@ -1,13 +0,0 @@ -package moe.tarsin.ehviewer - -import kotlinx.cinterop.CPointer -import kotlinx.cinterop.invoke -import kotlinx.cinterop.pointed -import platform.android.JNIEnvVar -import platform.android.jclass -import platform.android.jobject - -@CName("Java_com_hippo_Native_rewriteGif") -fun rewriteGif(env: CPointer, thiz: jclass, buffer: jobject) { - val ptr = env.pointed.pointed!!.GetDirectBufferAddress!!.invoke(env, buffer) -} diff --git a/settings.gradle b/settings.gradle index 1d3ce4d2a..170072ce5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() @@ -18,4 +18,3 @@ dependencyResolutionManagement { enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") rootProject.name = "EhViewer" include ':app' -include ':native'