Skip to content

Commit 8be9eed

Browse files
qq549631030qq549631030
committed
最低支持AGP 7.4.0
1 parent b5e6635 commit 8be9eed

18 files changed

Lines changed: 50 additions & 1007 deletions

‎app/build.gradle.kts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@ import cn.hx.plugin.junkcode.ext.JunkCodeConfig
22

33
plugins {
44
alias(libs.plugins.android.application)
5-
alias(libs.plugins.kotlin.android)
65
alias(libs.plugins.android.junk.code)
76
alias(libs.plugins.dexcount)
87
}
98

109
android {
1110
namespace = "cn.hx.plugin.junkcode.demo"
12-
compileSdk = 34
11+
compileSdk = 36
1312

1413
defaultConfig {
1514
applicationId = "cn.hx.plugin.junkcode.demo"
16-
minSdk = 19
17-
targetSdk = 34
15+
minSdk = 23
16+
targetSdk = 36
1817
versionCode = 1
1918
versionName = "1.0"
2019
multiDexEnabled = true
@@ -38,9 +37,6 @@ android {
3837
sourceCompatibility = JavaVersion.VERSION_1_8
3938
targetCompatibility = JavaVersion.VERSION_1_8
4039
}
41-
kotlinOptions {
42-
jvmTarget = "1.8"
43-
}
4440
lint {
4541
checkReleaseBuilds = false
4642
abortOnError = false

‎app/src/main/java/cn/hx/plugin/junkcode/demo/AppApplication.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package cn.hx.plugin.junkcode.demo
22

33
import android.app.Application
44
import android.content.Context
5-
import androidx.multidex.MultiDex
65

76
class AppApplication : Application() {
87
override fun attachBaseContext(base: Context?) {
98
super.attachBaseContext(base)
10-
MultiDex.install(this)
119
}
1210
}

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ org.gradle.jvmargs=-Xmx2048m
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1717
android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
19-
android.enableJetifier=true
2019
# Kotlin code style for this project: "official" or "obsolete":
2120
kotlin.code.style=official
2221

‎gradle/libs.versions.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
[versions]
2-
agp = "8.6.1"
2+
agp = "9.0.0"
33
javapoet = "1.13.0"
4-
gradleApi = "8.0.0"
5-
kotlin = "1.9.24"
6-
coreKtx = "1.10.1"
4+
# @pin 最低支持AGP版本
5+
gradleApi = "7.4.0"
6+
kotlin = "2.3.10"
7+
coreKtx = "1.17.0"
78
junit = "4.13.2"
8-
junitVersion = "1.2.1"
9-
espressoCore = "3.6.1"
10-
appcompat = "1.6.1"
11-
material = "1.10.0"
12-
activity = "1.8.0"
13-
constraintlayout = "2.1.4"
9+
junitVersion = "1.3.0"
10+
espressoCore = "3.7.0"
11+
appcompat = "1.7.1"
12+
material = "1.13.0"
13+
activity = "1.12.4"
14+
constraintlayout = "2.2.1"
1415
junkCode = "2.0.0"
1516
#junkCode = "1.3.4"
16-
dexcount = "3.0.1"
17+
dexcount = "4.0.0"
1718

1819
[libraries]
1920
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
77
networkTimeout=60000
88
validateDistributionUrl=true

‎library/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("com.gradle.plugin-publish") version "1.3.0"
3-
id("com.vanniktech.maven.publish") version "0.29.0"
2+
id("com.gradle.plugin-publish") version "2.0.0"
3+
id("com.vanniktech.maven.publish") version "0.36.0"
44
alias(libs.plugins.kotlin.jvm)
55
}
66

‎library/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ POM_DEVELOPER_ID=qq549631030
2121
POM_DEVELOPER_NAME=huangx
2222
POM_DEVELOPER_URL=https://github.com/qq549631030/
2323

24-
SONATYPE_HOST=DEFAULT
25-
SONATYPE_AUTOMATIC_RELEASE=true
24+
mavenCentralPublishing=true
25+
mavenCentralAutomaticPublishing=true
2626

2727
#signing.keyId=[you keyId last 8bit]
2828
#signing.password=[you key password]

‎library/src/main/groovy/cn/hx/plugin/junkcode/ext/AndroidJunkCodeExt.groovy‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎library/src/main/groovy/cn/hx/plugin/junkcode/ext/JunkCodeConfig.groovy‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎library/src/main/groovy/cn/hx/plugin/junkcode/plugin/AndroidJunkCodePlugin.groovy‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)