Skip to content

G
GradlePlugin
Commit 9e67dcce authored by tongzifang's avatar tongzifang
Browse files
Options

add legu

parent bb5d9819
Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 19 deletions
.idea/caches/deviceStreaming.xml 0 → 100644
View file @ 9e67dcce
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DeviceStreaming">
<option name="deviceSelectionList">
<list>
<PersistentDeviceSelectionData>
<option name="api" value="27" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="F01L" />
<option name="id" value="F01L" />
<option name="manufacturer" value="FUJITSU" />
<option name="name" value="F-01L" />
<option name="screenDensity" value="360" />
<option name="screenX" value="720" />
<option name="screenY" value="1280" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="28" />
<option name="brand" value="DOCOMO" />
<option name="codename" value="SH-01L" />
<option name="id" value="SH-01L" />
<option name="manufacturer" value="SHARP" />
<option name="name" value="AQUOS sense2 SH-01L" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="Lenovo" />
<option name="codename" value="TB370FU" />
<option name="id" value="TB370FU" />
<option name="manufacturer" value="Lenovo" />
<option name="name" value="Tab P12" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1840" />
<option name="screenY" value="2944" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="samsung" />
<option name="codename" value="a51" />
<option name="id" value="a51" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A51" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="akita" />
<option name="id" value="akita" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="b0q" />
<option name="id" value="b0q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S22 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="32" />
<option name="brand" value="google" />
<option name="codename" value="bluejay" />
<option name="id" value="bluejay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="caiman" />
<option name="id" value="caiman" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro" />
<option name="screenDensity" value="360" />
<option name="screenX" value="960" />
<option name="screenY" value="2142" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="comet" />
<option name="id" value="comet" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="29" />
<option name="brand" value="samsung" />
<option name="codename" value="crownqlteue" />
<option name="id" value="crownqlteue" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Note9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="dm3q" />
<option name="id" value="dm3q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S23 Ultra" />
<option name="screenDensity" value="600" />
<option name="screenX" value="1440" />
<option name="screenY" value="3088" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="e1q" />
<option name="id" value="e1q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="felix" />
<option name="id" value="felix" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="felix_camera" />
<option name="id" value="felix_camera" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Fold (Camera-enabled)" />
<option name="screenDensity" value="420" />
<option name="screenX" value="2208" />
<option name="screenY" value="1840" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="gts8uwifi" />
<option name="id" value="gts8uwifi" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S8 Ultra" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1848" />
<option name="screenY" value="2960" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="husky" />
<option name="id" value="husky" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8 Pro" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="motorola" />
<option name="codename" value="java" />
<option name="id" value="java" />
<option name="manufacturer" value="Motorola" />
<option name="name" value="G20" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="komodo" />
<option name="id" value="komodo" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9 Pro XL" />
<option name="screenDensity" value="360" />
<option name="screenX" value="1008" />
<option name="screenY" value="2244" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="lynx" />
<option name="id" value="lynx" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7a" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />
<option name="codename" value="oriole" />
<option name="id" value="oriole" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="panther" />
<option name="id" value="panther" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 7" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q5q" />
<option name="id" value="q5q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold5" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1812" />
<option name="screenY" value="2176" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="q6q" />
<option name="id" value="q6q" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1856" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="r11" />
<option name="id" value="r11" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Watch" />
<option name="screenDensity" value="320" />
<option name="screenX" value="384" />
<option name="screenY" value="384" />
<option name="type" value="WEAR_OS" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
<option name="codename" value="redfin" />
<option name="id" value="redfin" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 5" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="shiba" />
<option name="id" value="shiba" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 8" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="google" />
<option name="codename" value="tangorpro" />
<option name="id" value="tangorpro" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel Tablet" />
<option name="screenDensity" value="320" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
<option name="codename" value="tokay" />
<option name="id" value="tokay" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 9" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
</list>
</option>
</component>
</project>
\ No newline at end of file
.idea/gradle.xml
View file @ 9e67dcce
......@@ -4,6 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
......@@ -11,15 +12,7 @@
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
......
.idea/kotlinc.xml
View file @ 9e67dcce
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.6.21" />
<option name="version" value="1.7.22" />
</component>
</project>
\ No newline at end of file
.idea/migrations.xml 0 → 100644
View file @ 9e67dcce
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>
\ No newline at end of file
.idea/misc.xml
View file @ 9e67dcce
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
.idea/runConfigurations.xml 0 → 100644
View file @ 9e67dcce
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
<option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
<option value="com.intellij.execution.junit.PatternConfigurationProducer" />
<option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
<option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
<option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
<option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
</set>
</option>
</component>
</project>
\ No newline at end of file
build.gradle
View file @ 9e67dcce
......@@ -133,6 +133,12 @@ gradlePlugin {
implementationClass = 'com.qmai.android.plugin.OssFileUploadPlugin'
}
}
plugins {
OssAndPyger {
id = 'GradlePlugin.OssAndPyger'
implementationClass = 'com.qmai.android.plugin.OssAndPygerPlugin'
}
}
plugins {
pygerUpload {
id = 'GradlePlugin.pygerUpload'
......@@ -251,7 +257,7 @@ task hot{
}
group 'com.qmai.android.plugin'
version '1.103'
version '1.110.17'
gradlePublish {
......
local.properties
View file @ 9e67dcce
......@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue Aug 22 12:10:35 CST 2023
sdk.dir=/Users/leiwang/Library/Android/sdk
#Tue May 30 18:13:00 CST 2023
sdk.dir=/Users/tongzi/Library/Android/sdk
src/main/groovy/com/qmai/android/plugin/MultiUploadBean.groovy 0 → 100644
View file @ 9e67dcce
package com.qmai.android.plugin
/***
* oss 上传需要的参数
*/
class MultiUploadBean {
String ossPath
String appName
String versionCode
String versionName
ArrayList<String> flavors = []
ArrayList<String> buildTypes = []
}
src/main/groovy/com/qmai/android/plugin/OssAndPygerPlugin.groovy 0 → 100644
View file @ 9e67dcce
package com.qmai.android.plugin
import org.gradle.api.Plugin
import org.gradle.api.Project
/***
* 编译加上传到oss中
*/
class OssAndPygerPlugin implements Plugin<Project> {
@Override
void apply(Project project) {
MultiUploadBean ossUploadFileBean = project.getExtensions().create("uploadOssAndPyger", MultiUploadBean.class)
PygerBean pygerBean = project.getExtensions().create("BuildAndPygerInfo", PygerBean.class)
project.afterEvaluate {
print("-OssAndPygerPlugin---buildTypes--:$ossUploadFileBean.buildTypes")
print("-OssAndPygerPlugin---flavors--:$ossUploadFileBean.flavors")
if (ossUploadFileBean.buildTypes != null) {
List<List<String>> combinedList = new ArrayList<>()
ossUploadFileBean.buildTypes.forEach { type ->
if (ossUploadFileBean.flavors == null || ossUploadFileBean.flavors.size() == 0) {
List<String> child = new ArrayList<>()
child.add(type)
child.add("")
combinedList.add(child)
} else {
ossUploadFileBean.flavors.forEach { flavor ->
List<String> child = new ArrayList<>()
child.add(type)
child.add(flavor)
combinedList.add(child)
}
}
}
print("-OssAndPygerPlugin---combinedList--:$combinedList")
combinedList.forEach { combinedListItem ->
String type = combinedListItem.get(0)
String flavor = combinedListItem.get(1)
String taskOssName = "uploadOss${firstLetterUpper(type)}${firstLetterUpper(flavor)}"
String taskPygerName = "uploadPyger${firstLetterUpper(type)}${firstLetterUpper(flavor)}"
print("-OssAndPygerPlugin--taskName:$taskOssName")
print("-OssAndPygerPlugin--taskPygerName:$taskPygerName")
String dirName = "${project.layout.buildDirectory.asFile.get()}/outputs/apk/$flavor/$type/"
String apkName = "qmsd_${type}_${flavor}" +
"_${ossUploadFileBean.versionCode}_${ossUploadFileBean.versionName}.apk"
def uploadFile = new File(dirName + apkName)
print("-OssAndPygerPlugin--dirName apkName:${dirName + apkName}")
project.getTasks().register(taskOssName, OssUploadTask.class, uploadFile, ossUploadFileBean.ossPath, type,
flavor, ossUploadFileBean.appName)
project.getTasks().register(taskPygerName,
PygerUploadTask.class, uploadFile,
firstLetterUpper(type), pygerBean.key, flavor, ossUploadFileBean.appName)
}
}
}
};
//首字符大写
String firstLetterUpper(String str) {
char[] cs = str.toCharArray()
cs[0] -= 32
return String.valueOf(cs)
}
}
src/main/groovy/com/qmai/android/plugin/OssUploadTask.groovy
View file @ 9e67dcce
......@@ -71,7 +71,7 @@ class OssUploadTask extends DefaultTask {
try {
println("file name= " + file.name)
println("file path= " + file.absolutePath + " " + file.getCanonicalPath())
// println("begin upload " + file.exists())
// println("begin upload " + file.exists())
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath + fileName, file)
ossClient.putObject(putObjectRequest)
println("--------------------------------------------------------------------------")
......@@ -89,7 +89,13 @@ class OssUploadTask extends DefaultTask {
//https://cli.im/api/qrcode/code?text
def downloadUrl = "https://files.qmai.cn/$ossPath$fileName"
def qrDownloadUrl = "https://cli.im/api/qrcode/code?text=${downloadUrl}"
def content = "${appName.isEmpty() ? file.name : appName}: 下载地址为: https://files.qmai.cn/$ossPath$fileName\n 二维码地址:$qrDownloadUrl\n 当前环境: $buildType\n目标cpu: $flavor\n当前分支: ${getBranch()}"
def content = "${appName.isEmpty() ? file.name : appName}: " +
"下载地址为: https://files.qmai.cn/$ossPath$fileName\n" +
"二维码地址:$qrDownloadUrl\n" +
"当前环境: $buildType\n" +
"目标cpu: $flavor\n" +
"是否加固: ${isLegu{}}\n" +
"当前分支: ${getBranch()}"
def dingDingdetail = new FsDetailInfoModel(content)
def dingdingInfo = new FsInfoModel(dingDingdetail)
RequestBody requestBody = RequestBody.create(JSON, gson.toJson(dingdingInfo))
......@@ -114,6 +120,19 @@ class OssUploadTask extends DefaultTask {
}
}
@Input
boolean isLegu() {
Map<String, String> map = System.getenv()
if (map == null) {
return false
}
String str = map.get("legu")
if (str == null) {
return false
} else {
return str == "true"
}
}
@Input
boolean isInJenkins() {
......@@ -154,14 +173,14 @@ class OssUploadTask extends DefaultTask {
}
@Input
OssParamsBean getOssInfo(){
OssParamsBean getOssInfo() {
OssParamsBean ossParamsBean = new OssParamsBean()
Map<String,String> params = System.getenv()
Map<String, String> params = System.getenv()
ossParamsBean.app_oss_endpoint = params.get("app_oss_endpoint")
ossParamsBean.app_oss_accessKeyId = params.get("app_oss_accessKeyId")
ossParamsBean.app_oss_accessKeySecret = params.get("app_oss_accessKeySecret")
ossParamsBean.app_oss_path = params.get("app_oss_path")
ossParamsBean.app_oss_bucketName = params.get("app_oss_bucketName")
return ossParamsBean
return ossParamsBean
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment