Skip to content

Commit d92f53d

Browse files
committed
Rename package to dev.mihon.image.decoder
And groupId/artifactId as `dev.mihon:image-decoder`
1 parent 97f657d commit d92f53d

8 files changed

Lines changed: 27 additions & 28 deletions

File tree

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ plugins {
55
id "com.dorongold.task-tree" version "4.0.0"
66
}
77

8-
group = 'tachiyomiorg'
8+
group = 'dev.mihon'
99

1010
android {
11-
namespace = 'tachiyomi.decoder'
11+
namespace = 'dev.mihon.image.decoder'
1212

1313
compileSdkVersion 33
1414
ndkVersion "26.3.11579264"
@@ -28,7 +28,7 @@ android {
2828
}
2929

3030
ndk {
31-
// abiFilters 'arm64-v8a'
31+
abiFilters 'arm64-v8a'
3232
}
3333
}
3434

@@ -143,7 +143,7 @@ afterEvaluate {
143143
// Creates a Maven publication called "release".
144144
release(MavenPublication) {
145145
from components.release
146-
groupId = 'tachiyomiorg'
146+
groupId = 'dev.mihon'
147147
artifactId = 'image-decoder'
148148
version = '1.0'
149149
}

library/consumer-rules.pro

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
-keep class tachiyomi.decoder.ImageDecoder { *; }
2-
-keep class tachiyomi.decoder.ImageDecoder$Companion { *; }
3-
-keep class tachiyomi.decoder.ImageType { *; }
4-
-keep class tachiyomi.decoder.Format { *; }
5-
-keep class tachiyomi.decoder.Format$Companion { *; }
1+
-keep class image.decoder.ImageDecoder { *; }
2+
-keep class image.decoder.ImageDecoder$Companion { *; }
3+
-keep class image.decoder.ImageType { *; }
4+
-keep class image.decoder.Format { *; }
5+
-keep class image.decoder.Format$Companion { *; }

library/src/androidTest/java/tachiyomi/decoder/ImageDecoderTest.kt renamed to library/src/androidTest/java/image/decoder/ImageDecoderTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tachiyomi.decoder
1+
package image.decoder
22

33
import android.content.Context
44
import android.graphics.Bitmap
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="tachiyomi.decoder">
3+
package="dev.mihon.image.decoder">
44

55
</manifest>

library/src/main/cpp/image-decoder/java_objects.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ static jmethodID createBitmapMethod;
1313
void init_java_objects(JNIEnv* env) {
1414
jclass tmpCls;
1515

16-
tmpCls = env->FindClass("tachiyomi/decoder/ImageDecoder");
16+
tmpCls = env->FindClass("dev/mihon/image/decoder/ImageDecoder");
1717
imageDecoderCls = (jclass)env->NewGlobalRef(tmpCls);
1818
imageDecoderCtor = env->GetMethodID(imageDecoderCls, "<init>", "(JII)V");
1919

20-
tmpCls = env->FindClass("tachiyomi/decoder/ImageType");
20+
tmpCls = env->FindClass("dev/mihon/image/decoder/ImageType");
2121
imageTypeCls = (jclass)env->NewGlobalRef(tmpCls);
2222
imageTypeCtor = env->GetMethodID(imageTypeCls, "<init>", "(IZ)V");
2323

library/src/main/cpp/image-decoder/java_wrapper.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ jint JNI_OnLoad(JavaVM* vm, void*) {
2525
}
2626

2727
extern "C" JNIEXPORT jobject JNICALL
28-
Java_tachiyomi_decoder_ImageDecoder_nativeNewInstance(JNIEnv* env, jclass,
29-
jobject jstream,
30-
jboolean cropBorders,
31-
jbyteArray icm_stream) {
28+
Java_dev_mihon_image_decoder_ImageDecoder_nativeNewInstance(
29+
JNIEnv* env, jclass, jobject jstream, jboolean cropBorders,
30+
jbyteArray icm_stream) {
3231
auto stream = read_all_java_stream(env, jstream);
3332
if (!stream) {
3433
return nullptr;
@@ -63,11 +62,11 @@ Java_tachiyomi_decoder_ImageDecoder_nativeNewInstance(JNIEnv* env, jclass,
6362
}
6463

6564
extern "C" JNIEXPORT jobject JNICALL
66-
Java_tachiyomi_decoder_ImageDecoder_nativeDecode(JNIEnv* env, jobject,
67-
jlong decoderPtr,
68-
jint sampleSize, jint x,
69-
jint y, jint width,
70-
jint height) {
65+
Java_dev_mihon_image_decoder_ImageDecoder_nativeDecode(JNIEnv* env, jobject,
66+
jlong decoderPtr,
67+
jint sampleSize, jint x,
68+
jint y, jint width,
69+
jint height) {
7170
auto* decoder = (VipsDecoder*)decoderPtr;
7271

7372
// Bounds of the image when crop borders is enabled, otherwise it matches the
@@ -112,15 +111,15 @@ Java_tachiyomi_decoder_ImageDecoder_nativeDecode(JNIEnv* env, jobject,
112111
}
113112

114113
extern "C" JNIEXPORT void JNICALL
115-
Java_tachiyomi_decoder_ImageDecoder_nativeRecycle(JNIEnv*, jobject,
116-
jlong decoderPtr) {
114+
Java_dev_mihon_image_decoder_ImageDecoder_nativeRecycle(JNIEnv*, jobject,
115+
jlong decoderPtr) {
117116
auto* decoder = (VipsDecoder*)decoderPtr;
118117
delete decoder;
119118
}
120119

121120
extern "C" JNIEXPORT jobject JNICALL
122-
Java_tachiyomi_decoder_ImageDecoder_nativeFindType(JNIEnv* env, jclass,
123-
jbyteArray array) {
121+
Java_dev_mihon_image_decoder_ImageDecoder_nativeFindType(JNIEnv* env, jclass,
122+
jbyteArray array) {
124123
uint32_t toRead = 32;
125124
uint32_t size = env->GetArrayLength(array);
126125

library/src/main/java/tachiyomi/decoder/ImageDecoder.kt renamed to library/src/main/java/image/decoder/ImageDecoder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tachiyomi.decoder
1+
package image.decoder
22

33
import android.graphics.Bitmap
44
import android.graphics.Rect

library/src/main/java/tachiyomi/decoder/ImageType.kt renamed to library/src/main/java/image/decoder/ImageType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tachiyomi.decoder
1+
package image.decoder
22

33
data class ImageType internal constructor(
44
val format: Format,

0 commit comments

Comments
 (0)