Skip to content

Commit ea83168

Browse files
committed
升级 Gradle 版本到 7.6.6 并临时处理 EasyLauncher 插件冲突的问题
1 parent 84ab7ae commit ea83168

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

app/build.gradle

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
44
id 'io.github.wurensen.android-aspectjx'
5-
id 'com.starter.easylauncher'
5+
// id 'com.starter.easylauncher'
66
}
77

88
apply from : '../common.gradle'
@@ -144,25 +144,25 @@ android {
144144
}
145145

146146
// 应用启动图标配置
147-
easylauncher {
148-
buildTypes {
149-
preview {
150-
filters = [
151-
customRibbon(label: "preview", position: "topRight",
152-
ribbonColor: "#b65656", labelColor: "#FFFFFF")
153-
]
154-
}
155-
debug {
156-
filters = [
157-
customRibbon(label: "debug", position: "topRight",
158-
ribbonColor: "#b65656", labelColor: "#FFFFFF")
159-
]
160-
}
161-
release {
162-
enable false
163-
}
164-
}
165-
}
147+
//easylauncher {
148+
// buildTypes {
149+
// preview {
150+
// filters = [
151+
// customRibbon(label: "preview", position: "topRight",
152+
// ribbonColor: "#b65656", labelColor: "#FFFFFF")
153+
// ]
154+
// }
155+
// debug {
156+
// filters = [
157+
// customRibbon(label: "debug", position: "topRight",
158+
// ribbonColor: "#b65656", labelColor: "#FFFFFF")
159+
// ]
160+
// }
161+
// release {
162+
// enable false
163+
// }
164+
// }
165+
//}
166166

167167
// 添加构建依赖项:https://developer.android.google.cn/studio/build/dependencies
168168
// api 与 implementation 的区别:https://www.jianshu.com/p/8962d6ba936e

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// AndroidProject 版本:v15.0
22
plugins {
3-
id 'com.android.application' version '7.1.3' apply false
3+
id 'com.android.application' version '7.4.2' apply false
44
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
55
// AOP 插件:https://github.com/wurensen/gradle_plugin_android_aspectjx
66
id 'io.github.wurensen.android-aspectjx' version '3.3.2' apply false
77
// 多 buildType 图标插件:https://github.com/usefulness/easylauncher-gradle-plugin
8-
id 'com.starter.easylauncher' version '6.1.0' apply false
8+
// id 'com.starter.easylauncher' version '6.1.0' apply false
99
}
1010

1111
// 导入配置文件
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
zipStoreBase = GRADLE_USER_HOME
2-
zipStorePath = wrapper/dists
3-
distributionBase = GRADLE_USER_HOME
4-
distributionPath = wrapper/dists
5-
distributionUrl = https\://services.gradle.org/distributions/gradle-7.2-all.zip
1+
zipStoreBase=GRADLE_USER_HOME
2+
zipStorePath=wrapper/dists
3+
distributionBase=GRADLE_USER_HOME
4+
distributionPath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-all.zip

0 commit comments

Comments
 (0)