Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

keep agp up to date #412

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

keep agp up to date #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/ProjectAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package com.jaredsburrows.license
import com.android.build.gradle.AppExtension
import com.android.build.gradle.AppPlugin
import com.android.build.gradle.BaseExtension
import com.android.build.gradle.FeatureExtension
import com.android.build.gradle.FeaturePlugin
import com.android.build.gradle.LibraryExtension
import com.android.build.gradle.LibraryPlugin
import com.android.build.gradle.TestExtension
Expand All @@ -21,8 +19,6 @@ internal fun Project.isAndroidProject(): Boolean {
// AppPlugin
"android",
"com.android.application",
// FeaturePlugin
"com.android.feature",
// LibraryPlugin
"android-library",
"com.android.library",
Expand All @@ -36,7 +32,6 @@ internal fun Project.isAndroidProject(): Boolean {
* Configure for Android projects.
*
* AppPlugin - "android", "com.android.application"
* FeaturePlugin - "com.android.feature"
* LibraryPlugin - "android-library", "com.android.library"
* TestPlugin - "com.android.test"
*/
Expand All @@ -51,15 +46,6 @@ internal fun Project.configureAndroidProject() {
}
}

is FeaturePlugin -> {
extensions.getByType(FeatureExtension::class.java).run {
configureVariant(this, featureVariants)
configureVariant(this, libraryVariants)
configureVariant(this, testVariants)
configureVariant(this, unitTestVariants)
}
}

is LibraryPlugin -> {
extensions.getByType(LibraryExtension::class.java).run {
configureVariant(this, libraryVariants)
Expand Down
5 changes: 0 additions & 5 deletions gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ final class LicensePluginSpec extends Specification {
@Rule
public final TemporaryFolder testProjectDir = new TemporaryFolder()
private int compileSdkVersion = 34
private String agpVersion = "3.6.4"
private List<File> pluginClasspath
private String classpathString
private File buildFile
Expand Down Expand Up @@ -206,7 +205,6 @@ final class LicensePluginSpec extends Specification {
}

dependencies {
classpath "com.android.tools.build:gradle:$agpVersion"
classpath files($classpathString)
}
}
Expand All @@ -233,7 +231,6 @@ final class LicensePluginSpec extends Specification {
}

dependencies {
classpath "com.android.tools.build:gradle:$agpVersion"
classpath files($classpathString)
}
}
Expand Down Expand Up @@ -262,8 +259,6 @@ final class LicensePluginSpec extends Specification {
// AppPlugin
'android',
'com.android.application',
// FeaturePlugin
'com.android.feature',
// LibraryPlugin
'android-library',
'com.android.library',
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
license = { id = "com.jaredsburrows.license", version = "0.9.4" }

[libraries]
android-plugin = { module = "com.android.tools.build:gradle", version = "3.6.4" }
android-plugin = { module = "com.android.tools.build:gradle", version = "8.2.2" }
commons = { module = "org.apache.commons:commons-csv", version = "1.10.0" }
moshi = { module = "com.squareup.moshi:moshi", version = "1.15.0" }
kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
Expand Down