From 3ddd4b3c0d07f03c6f5ea8fea2a76d645e53c408 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Sat, 15 Apr 2023 00:55:55 +0800 Subject: [PATCH] Modify move maven configs from .gradle to .maven directory and make it to json file --- .gitignore | 1 + build.gradle | 24 ++++++++++-------------- yukihookapi-ksp-xposed/build.gradle | 5 +++-- yukihookapi/build.gradle | 5 +++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index aa724b77..2fbf0126 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.iml .gradle +.maven /local.properties /.idea/caches /.idea/libraries diff --git a/build.gradle b/build.gradle index 2a947438..b5db1542 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ -//file:noinspection unused +import groovy.json.JsonSlurper + plugins { id 'com.android.application' version '7.4.1' apply false id 'com.android.library' version '7.4.1' apply false @@ -24,23 +25,18 @@ ext { } /** - * 获取授权文件内容 - 用于 Maven 的提交 - * - * 若编译失败请将路径替换为自己的或置空 - * @param name - * @return [String] + * 获取 Maven 授权信息 - 用于 Maven 的提交 + * @param childProjectDir 子项目的目录 + * @return [Object] */ -static String getFileContent(String name) { - String result = "" +@SuppressWarnings('unused') +static Object getMavenCredentials(File childProjectDir) { + def slurper = new JsonSlurper() try { - FileReader reader = new FileReader("/Users/fankes/Project/Android/Xposed/YukiHookAPI/.gradle/" + name) - BufferedReader buff = new BufferedReader(reader) - result = buff.readLine() - buff.close() - reader.close() + return slurper.parse(new File("${childProjectDir.getParent()}/.maven/credentials.json")) } catch (Throwable ignored) { + return slurper.parseText('{"username":"-NEEDED-","password":"-NEEDED-"}') } - return result } task clean(type: Delete) { diff --git a/yukihookapi-ksp-xposed/build.gradle b/yukihookapi-ksp-xposed/build.gradle index 96381b5e..28ead215 100644 --- a/yukihookapi-ksp-xposed/build.gradle +++ b/yukihookapi-ksp-xposed/build.gradle @@ -70,8 +70,9 @@ publishing { name = rootProject.ext.ossName url = rootProject.ext.ossUrl credentials { - username = getFileContent("OSSRH_USERNAME") - password = getFileContent("OSSRH_PASSWORD") + def configs = getMavenCredentials(projectDir) + username = configs.username + password = configs.password } } } diff --git a/yukihookapi/build.gradle b/yukihookapi/build.gradle index 5ff12f17..a8dd93b6 100644 --- a/yukihookapi/build.gradle +++ b/yukihookapi/build.gradle @@ -89,8 +89,9 @@ publishing { name = rootProject.ext.ossName url = rootProject.ext.ossUrl credentials { - username = getFileContent("OSSRH_USERNAME") - password = getFileContent("OSSRH_PASSWORD") + def configs = getMavenCredentials(projectDir) + username = configs.username + password = configs.password } } }