diff --git a/yukihookapi-stub/build.gradle b/yukihookapi-stub/build.gradle index cdb7fb5f..ae931930 100644 --- a/yukihookapi-stub/build.gradle +++ b/yukihookapi-stub/build.gradle @@ -1,24 +1,42 @@ plugins { - id 'java-library' - id 'org.jetbrains.kotlin.jvm' + id 'com.android.library' + id 'org.jetbrains.kotlin.android' } -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} +android { + namespace 'com.highcapable.yukihookapi.stub' + compileSdk rootProject.ext.android.compileSdk -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + defaultConfig { + minSdk rootProject.ext.android.minSdk + targetSdk rootProject.ext.android.targetSdk + + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } kotlinOptions { - jvmTarget = 11 + jvmTarget = '11' freeCompilerArgs = [ '-Xno-param-assertions', '-Xno-call-assertions', '-Xno-receiver-assertions' ] } + lintOptions { + checkReleaseBuilds false + } } dependencies { - compileOnly fileTree(include: ['*.jar'], dir: '../yukihookapi/libs') + implementation 'androidx.annotation:annotation:1.6.0' } \ No newline at end of file diff --git a/yukihookapi-stub/consumer-rules.pro b/yukihookapi-stub/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/yukihookapi-stub/proguard-rules.pro b/yukihookapi-stub/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/yukihookapi-stub/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/yukihookapi-stub/src/main/AndroidManifest.xml b/yukihookapi-stub/src/main/AndroidManifest.xml new file mode 100644 index 00000000..568741e5 --- /dev/null +++ b/yukihookapi-stub/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/yukihookapi/build.gradle b/yukihookapi/build.gradle index c153a115..032af781 100644 --- a/yukihookapi/build.gradle +++ b/yukihookapi/build.gradle @@ -1,25 +1,56 @@ plugins { - id 'java-library' - id 'org.jetbrains.kotlin.jvm' + id 'com.android.library' + id 'org.jetbrains.kotlin.android' id 'maven-publish' id 'signing' } -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - sourceSets.main { java.srcDir("src/api/kotlin") } - withJavadocJar() - withSourcesJar() -} +android { + namespace 'com.highcapable.yukihookapi' + compileSdk rootProject.ext.android.compileSdk -javadoc { - options.addStringOption("charset", "UTF-8") - if (JavaVersion.current().isJava9Compatible()) options.addBooleanOption('html5', true) + defaultConfig { + minSdk rootProject.ext.android.minSdk + targetSdk rootProject.ext.android.targetSdk + + buildConfigField('String', 'API_VERSION_NAME', "\"${rootProject.ext.maven.repository.apiVersion.name}\"") + buildConfigField('int', 'API_VERSION_CODE', "${rootProject.ext.maven.repository.apiVersion.code}") + + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = '11' + freeCompilerArgs = [ + '-opt-in=com.highcapable.yukihookapi.annotation.YukiPrivateApi', + '-opt-in=com.highcapable.yukihookapi.annotation.YukiGenerateApi', + '-Xno-param-assertions', + '-Xno-call-assertions', + '-Xno-receiver-assertions' + ] + } + lintOptions { + checkReleaseBuilds false + } + publishing { + singleVariant('release') { + withSourcesJar() + withJavadocJar() + } + } } kotlin { - sourceSets.main { kotlin.srcDir("src/api/kotlin") } sourceSets { all { languageSettings { @@ -30,25 +61,18 @@ kotlin { } } -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - jvmTarget = 11 - freeCompilerArgs = [ - '-opt-in=com.highcapable.yukihookapi.annotation.YukiPrivateApi', - '-opt-in=com.highcapable.yukihookapi.annotation.YukiGenerateApi', - '-Xno-param-assertions', - '-Xno-call-assertions', - '-Xno-receiver-assertions' - ] - } -} - dependencies { // Used 82 API Version compileOnly 'de.robv.android.xposed:api:82' compileOnly project(':yukihookapi-stub') - compileOnly fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.annotation:annotation:1.6.0' + implementation 'androidx.core:core-ktx:1.10.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.preference:preference-ktx:1.2.0' +} + +tasks.register('androidSourcesJar', Jar) { + archiveClassifier.set('sources') + from android.sourceSets.main.java.srcDirs } group = rootProject.ext.maven.repository.groupId @@ -56,9 +80,10 @@ version = rootProject.ext.maven.repository.apiVersion.name publishing { publications { - mavenJava(MavenPublication) { + release(MavenPublication) { artifactId = 'api' - from components.java + artifact "$buildDir/outputs/aar/${project.name}-release.aar" + artifact androidSourcesJar pom { name = rootProject.ext.maven.repository.name description = rootProject.ext.maven.repository.description @@ -97,4 +122,4 @@ publishing { } } -signing { sign(publishing.publications.mavenJava) } \ No newline at end of file +signing { sign publishing.publications } \ No newline at end of file diff --git a/yukihookapi/consumer-rules.pro b/yukihookapi/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/yukihookapi/libs/android-stub.jar b/yukihookapi/libs/android-stub.jar deleted file mode 100644 index ba207008..00000000 Binary files a/yukihookapi/libs/android-stub.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-activity.jar b/yukihookapi/libs/androidx-activity.jar deleted file mode 100644 index c6661beb..00000000 Binary files a/yukihookapi/libs/androidx-activity.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-appcompat.jar b/yukihookapi/libs/androidx-appcompat.jar deleted file mode 100644 index d0c8d7ee..00000000 Binary files a/yukihookapi/libs/androidx-appcompat.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-core.jar b/yukihookapi/libs/androidx-core.jar deleted file mode 100644 index 2c40dd3f..00000000 Binary files a/yukihookapi/libs/androidx-core.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-customview.jar b/yukihookapi/libs/androidx-customview.jar deleted file mode 100644 index dd51769e..00000000 Binary files a/yukihookapi/libs/androidx-customview.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-drawerlayout.jar b/yukihookapi/libs/androidx-drawerlayout.jar deleted file mode 100644 index 2510a5ae..00000000 Binary files a/yukihookapi/libs/androidx-drawerlayout.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-fragment.jar b/yukihookapi/libs/androidx-fragment.jar deleted file mode 100644 index 160357a1..00000000 Binary files a/yukihookapi/libs/androidx-fragment.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-common.jar b/yukihookapi/libs/androidx-lifecycle-common.jar deleted file mode 100644 index da323a95..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-common.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-livedata-core.jar b/yukihookapi/libs/androidx-lifecycle-livedata-core.jar deleted file mode 100644 index 44a52c1b..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-livedata-core.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-livedata.jar b/yukihookapi/libs/androidx-lifecycle-livedata.jar deleted file mode 100644 index d0a17a98..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-livedata.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-runtime.jar b/yukihookapi/libs/androidx-lifecycle-runtime.jar deleted file mode 100644 index ef898eec..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-runtime.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-viewmodel-savestate.jar b/yukihookapi/libs/androidx-lifecycle-viewmodel-savestate.jar deleted file mode 100644 index ab6eb534..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-viewmodel-savestate.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-lifecycle-viewmodel.jar b/yukihookapi/libs/androidx-lifecycle-viewmodel.jar deleted file mode 100644 index 9cade31b..00000000 Binary files a/yukihookapi/libs/androidx-lifecycle-viewmodel.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-prefs.jar b/yukihookapi/libs/androidx-prefs.jar deleted file mode 100644 index 0b7582aa..00000000 Binary files a/yukihookapi/libs/androidx-prefs.jar and /dev/null differ diff --git a/yukihookapi/libs/androidx-savestate.jar b/yukihookapi/libs/androidx-savestate.jar deleted file mode 100644 index 40f58a55..00000000 Binary files a/yukihookapi/libs/androidx-savestate.jar and /dev/null differ diff --git a/yukihookapi/proguard-rules.pro b/yukihookapi/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/yukihookapi/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/yukihookapi/src/main/AndroidManifest.xml b/yukihookapi/src/main/AndroidManifest.xml new file mode 100644 index 00000000..568741e5 --- /dev/null +++ b/yukihookapi/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt similarity index 99% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt index 9e07f213..0a54a316 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/YukiHookAPI.kt +++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/YukiHookAPI.kt @@ -80,10 +80,10 @@ object YukiHookAPI { internal var isLoadedFromBaseContext = false /** 获取当前 [YukiHookAPI] 的版本 */ - const val API_VERSION_NAME = "1.1.8" + const val API_VERSION_NAME = BuildConfig.API_VERSION_NAME /** 获取当前 [YukiHookAPI] 的版本号 */ - const val API_VERSION_CODE = 41 + const val API_VERSION_CODE = BuildConfig.API_VERSION_CODE /** * 当前 [YukiHookAPI] 的状态 diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/CauseProblemsApi.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/CauseProblemsApi.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/CauseProblemsApi.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/CauseProblemsApi.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/YukiGenerateApi.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/YukiGenerateApi.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/YukiGenerateApi.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/YukiGenerateApi.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/YukiPrivateApi.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/YukiPrivateApi.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/YukiPrivateApi.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/YukiPrivateApi.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/annotation/xposed/InjectYukiHookWithXposed.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/CurrentClass.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/CurrentClass.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/CurrentClass.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/CurrentClass.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/GenericClass.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/GenericClass.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/GenericClass.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/GenericClass.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/HookClass.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/HookClass.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/HookClass.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/HookClass.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/HookResources.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/HookResources.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/HookResources.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/HookResources.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/VariousClass.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/VariousClass.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/bean/VariousClass.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/bean/VariousClass.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiResourcesHookCreator.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/YukiResourcesHookCreator.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiResourcesHookCreator.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/YukiResourcesHookCreator.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategoryHelper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategoryHelper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategoryHelper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiCategoryHelper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiProperty.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiProperty.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookApiProperty.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookApiProperty.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/compat/HookCompatHelper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/factory/YukiHookDelegateFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/helper/YukiHookHelper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/helper/YukiHookHelper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/helper/YukiHookHelper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/helper/YukiHookHelper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/priority/YukiHookPriority.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/priority/YukiHookPriority.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/priority/YukiHookPriority.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/priority/YukiHookPriority.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiHookCallback.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberHook.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberHook.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberHook.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberHook.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberReplacement.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberReplacement.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberReplacement.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/proxy/YukiMemberReplacement.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/result/YukiHookResult.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/result/YukiHookResult.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/result/YukiHookResult.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/result/YukiHookResult.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/store/YukiHookCacheStore.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/store/YukiHookCacheStore.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/api/store/YukiHookCacheStore.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/api/store/YukiHookCacheStore.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/BaseFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/BaseFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/BaseFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/BaseFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/ClassBaseFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/ClassBaseFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/ClassBaseFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/ClassBaseFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/MemberBaseFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/MemberBaseFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/MemberBaseFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/MemberBaseFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/data/BaseRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/data/BaseRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/data/BaseRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/data/BaseRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/CountRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/CountRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/CountRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/CountRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/ModifierRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/ModifierRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/ModifierRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/ModifierRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/NameRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/NameRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/NameRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/NameRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/ObjectRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/ObjectRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/base/rules/ObjectRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/base/rules/ObjectRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/DexClassFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/DexClassFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/DexClassFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/DexClassFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/data/ClassRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/data/ClassRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/data/ClassRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/data/ClassRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/ConstructorRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/ConstructorRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/ConstructorRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/ConstructorRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/FieldRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/FieldRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/FieldRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/FieldRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MemberRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MemberRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MemberRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MemberRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MethodRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MethodRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MethodRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/MethodRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/base/BaseRules.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/base/BaseRules.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/base/BaseRules.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/base/BaseRules.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/result/MemberRulesResult.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/result/MemberRulesResult.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/classes/rules/result/MemberRulesResult.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/classes/rules/result/MemberRulesResult.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/ConstructorFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/ConstructorFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/ConstructorFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/ConstructorFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/FieldFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/FieldFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/FieldFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/FieldFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/MethodFinder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/MethodFinder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/MethodFinder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/MethodFinder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/store/ReflectsCacheStore.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/store/ReflectsCacheStore.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/store/ReflectsCacheStore.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/store/ReflectsCacheStore.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/tools/ReflectionTool.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/tools/ReflectionTool.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/tools/ReflectionTool.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/tools/ReflectionTool.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/type/factory/TypeAliasFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/type/factory/TypeAliasFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/type/factory/TypeAliasFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/core/finder/type/factory/TypeAliasFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/entity/YukiBaseHooker.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/entity/YukiBaseHooker.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/entity/YukiBaseHooker.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/entity/YukiBaseHooker.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/ReflectionFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/factory/YukiHookFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/log/LoggerFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/HookParam.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/HookParam.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/HookParam.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/PackageParam.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/PackageParam.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/PackageParam.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/param/wrapper/PackageParamWrapper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/ComponentTypeFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/ComponentTypeFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/ComponentTypeFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/ComponentTypeFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/GraphicsTypeFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/GraphicsTypeFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/GraphicsTypeFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/GraphicsTypeFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/ViewTypeFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/ViewTypeFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/android/ViewTypeFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/android/ViewTypeFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/defined/DefinedTypeFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/defined/DefinedTypeFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/defined/DefinedTypeFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/defined/DefinedTypeFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt similarity index 98% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt index f01be2ed..0e388955 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt +++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/type/java/VariableTypeFactory.kt @@ -32,6 +32,7 @@ package com.highcapable.yukihookapi.hook.type.java import android.os.Build import com.highcapable.yukihookapi.hook.factory.classOf import com.highcapable.yukihookapi.hook.factory.toClass +import com.highcapable.yukihookapi.hook.factory.toClassOrNull import dalvik.system.BaseDexClassLoader import dalvik.system.DexClassLoader import dalvik.system.InMemoryDexClassLoader @@ -47,7 +48,6 @@ import java.lang.reflect.Member import java.lang.reflect.Method import java.net.HttpCookie import java.net.HttpURLConnection -import java.net.http.HttpClient import java.text.SimpleDateFormat import java.util.* import java.util.concurrent.atomic.AtomicBoolean @@ -665,9 +665,9 @@ val HttpCookieClass get() = classOf() /** * 获得 [HttpClient] 类型 - * @return [Class]<[HttpClient]> + * @return [Class] or null */ -val HttpClientClass get() = classOf() +val HttpClientClass get() = "java.net.http.HttpClient".toClassOrNull() /** * 获得 [AtomicBoolean] 类型 diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/application/ModuleApplication.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/application/ModuleApplication.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/application/ModuleApplication.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/application/ModuleApplication.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiXposedModule.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/YukiXposedModule.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/YukiXposedModule.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/YukiXposedModule.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/caller/YukiXposedModuleCaller.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/caller/YukiXposedModuleCaller.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/caller/YukiXposedModuleCaller.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/caller/YukiXposedModuleCaller.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/event/YukiXposedEvent.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/event/YukiXposedEvent.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/event/YukiXposedEvent.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/event/YukiXposedEvent.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/event/caller/YukiXposedEventCaller.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/event/caller/YukiXposedEventCaller.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/event/caller/YukiXposedEventCaller.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/event/caller/YukiXposedEventCaller.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/proxy/IYukiXposedModuleLifecycle.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/proxy/IYukiXposedModuleLifecycle.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/proxy/IYukiXposedModuleLifecycle.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/proxy/IYukiXposedModuleLifecycle.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiModuleResources.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiModuleResources.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiModuleResources.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiModuleResources.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResForwarder.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResForwarder.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResForwarder.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResForwarder.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResources.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResources.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResources.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/YukiResources.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/caller/YukiXposedResourcesCaller.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/caller/YukiXposedResourcesCaller.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/resources/caller/YukiXposedResourcesCaller.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/resources/caller/YukiXposedResourcesCaller.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiXposedModuleStatus.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiXposedModuleStatus.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiXposedModuleStatus.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/status/YukiXposedModuleStatus.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/type/HookEntryType.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/type/HookEntryType.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/bridge/type/HookEntryType.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/bridge/type/HookEntryType.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/YukiHookDataChannel.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/YukiHookDataChannel.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/YukiHookDataChannel.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/YukiHookDataChannel.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/data/ChannelData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/data/ChannelData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/data/ChannelData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/data/ChannelData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/data/wrapper/ChannelDataWrapper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/data/wrapper/ChannelDataWrapper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/data/wrapper/ChannelDataWrapper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/data/wrapper/ChannelDataWrapper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/priority/ChannelPriority.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/priority/ChannelPriority.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/priority/ChannelPriority.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/channel/priority/ChannelPriority.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt similarity index 99% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt index 5559d332..32d51324 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt +++ b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt @@ -152,6 +152,7 @@ internal object AppParasitics { * @return [Int] */ internal fun findUserId(packageName: String) = runCatching { + @Suppress("DEPRECATION") UserHandleClass.method { name = "getUserId" param(IntType) @@ -366,6 +367,7 @@ internal object AppParasitics { else -> error("This proxy [$it] type is not allowed") } }?.takeIf { it.isNotBlank() } ?: context.packageManager?.runCatching { + @Suppress("DEPRECATION") queryIntentActivities(getLaunchIntentForPackage(context.packageName)!!, 0).first().activityInfo.name }?.getOrNull() ?: "" if ((proxyClassName.hasClass(context.classLoader) && proxyClassName.toClass(context.classLoader).hasMethod { diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppActivity.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppActivity.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppActivity.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppActivity.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppCompatActivity.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppCompatActivity.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppCompatActivity.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/base/ModuleAppCompatActivity.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/config/ActivityProxyConfig.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/config/ActivityProxyConfig.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/config/ActivityProxyConfig.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/config/ActivityProxyConfig.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/InstrumentationDelegate.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/InstrumentationDelegate.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/InstrumentationDelegate.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/InstrumentationDelegate.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/HandlerDelegateCaller.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/HandlerDelegateCaller.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/HandlerDelegateCaller.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/HandlerDelegateCaller.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/IActivityManagerProxyCaller.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/IActivityManagerProxyCaller.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/IActivityManagerProxyCaller.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/caller/IActivityManagerProxyCaller.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/HandlerDelegateImpl.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/HandlerDelegateImpl.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/HandlerDelegateImpl.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/HandlerDelegateImpl.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/IActivityManagerProxyImpl.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/IActivityManagerProxyImpl.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/IActivityManagerProxyImpl.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/activity/delegate/impl/IActivityManagerProxyImpl.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/context/wrapper/ModuleContextThemeWrapper.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/context/wrapper/ModuleContextThemeWrapper.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/context/wrapper/ModuleContextThemeWrapper.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/context/wrapper/ModuleContextThemeWrapper.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/reference/ModuleClassLoader.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/reference/ModuleClassLoader.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/parasitic/reference/ModuleClassLoader.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/reference/ModuleClassLoader.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/YukiHookModulePrefs.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/data/PrefsData.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/prefs/ui/ModulePreferenceFragment.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/proxy/IYukiHookXposedInit.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/proxy/IYukiHookXposedInit.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/proxy/IYukiHookXposedInit.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/proxy/IYukiHookXposedInit.kt diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/proxy/YukiHookXposedInitProxy.kt b/yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/proxy/YukiHookXposedInitProxy.kt similarity index 100% rename from yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/proxy/YukiHookXposedInitProxy.kt rename to yukihookapi/src/main/java/com/highcapable/yukihookapi/hook/xposed/proxy/YukiHookXposedInitProxy.kt