Delete SupportJavaLibraryPlugin!
Test: ./gradlew tasks
Change-Id: I288b625731055d1a8b13910e40aa7c21cd87dd93
diff --git a/annotations/build.gradle b/annotations/build.gradle
index b1e4b46..2a03326 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -2,7 +2,8 @@
import androidx.build.LibraryVersions
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
jar {
diff --git a/arch/core-common/build.gradle b/arch/core-common/build.gradle
index c479f61..160234e 100644
--- a/arch/core-common/build.gradle
+++ b/arch/core-common/build.gradle
@@ -17,10 +17,11 @@
import static androidx.build.dependencies.DependenciesKt.*
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import androidx.build.AndroidXExtension;
+import androidx.build.AndroidXExtension
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
index 59c6772..6638ab3 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXExtension.kt
@@ -22,7 +22,7 @@
import kotlin.properties.Delegates
/**
- * Extension for [SupportAndroidLibraryPlugin] and [SupportJavaLibraryPlugin].
+ * Extension for [AndroidXPlugin].
*/
open class AndroidXExtension(val project: Project) {
var name: String? = null
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
deleted file mode 100644
index 6f7cf5d..0000000
--- a/buildSrc/src/main/kotlin/androidx/build/SupportJavaLibraryPlugin.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.build
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-
-/**
- * Support java library specific plugin that sets common configurations needed for
- * support library modules.
- */
-class SupportJavaLibraryPlugin : Plugin<Project> {
- override fun apply(project: Project) {
- project.apply<AndroidXPlugin>()
- project.apply(mapOf("plugin" to "java"))
- }
-}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/SupportJavaLibraryPlugin.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/SupportJavaLibraryPlugin.properties
deleted file mode 100644
index acc6819..0000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/SupportJavaLibraryPlugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=androidx.build.SupportJavaLibraryPlugin
\ No newline at end of file
diff --git a/collection/build.gradle b/collection/build.gradle
index e87ce2c..b094596 100644
--- a/collection/build.gradle
+++ b/collection/build.gradle
@@ -19,7 +19,8 @@
import androidx.build.LibraryVersions
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
diff --git a/concurrent/futures/build.gradle b/concurrent/futures/build.gradle
index 4874159..b721bcd 100644
--- a/concurrent/futures/build.gradle
+++ b/concurrent/futures/build.gradle
@@ -21,7 +21,8 @@
import static androidx.build.dependencies.DependenciesKt.*
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
diff --git a/lifecycle/common-java8/build.gradle b/lifecycle/common-java8/build.gradle
index 034c7df..5e7e963 100644
--- a/lifecycle/common-java8/build.gradle
+++ b/lifecycle/common-java8/build.gradle
@@ -20,7 +20,8 @@
import androidx.build.AndroidXExtension;
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index a87b5cd..1fb74d4 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -22,7 +22,8 @@
import static androidx.build.dependencies.DependenciesKt.*
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
diff --git a/paging/common/build.gradle b/paging/common/build.gradle
index cfd53e6..993136b 100644
--- a/paging/common/build.gradle
+++ b/paging/common/build.gradle
@@ -20,7 +20,8 @@
import androidx.build.AndroidXExtension;
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
id("kotlin")
}
diff --git a/paging/common/ktx/build.gradle b/paging/common/ktx/build.gradle
index f484745..8f09226 100644
--- a/paging/common/ktx/build.gradle
+++ b/paging/common/ktx/build.gradle
@@ -20,7 +20,7 @@
import androidx.build.AndroidXExtension
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
id("kotlin")
}
diff --git a/remotecallback/processor/build.gradle b/remotecallback/processor/build.gradle
index 0e2fb5b..a5db9c7 100644
--- a/remotecallback/processor/build.gradle
+++ b/remotecallback/processor/build.gradle
@@ -21,7 +21,8 @@
import androidx.build.LibraryVersions
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/room/common-java8/build.gradle b/room/common-java8/build.gradle
index 4effa22..0728e7c 100644
--- a/room/common-java8/build.gradle
+++ b/room/common-java8/build.gradle
@@ -20,7 +20,8 @@
import androidx.build.AndroidXExtension;
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/room/common/build.gradle b/room/common/build.gradle
index dbac4d3..5f2d028 100644
--- a/room/common/build.gradle
+++ b/room/common/build.gradle
@@ -20,7 +20,8 @@
import androidx.build.AndroidXExtension;
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
diff --git a/room/migration/build.gradle b/room/migration/build.gradle
index bf979b3..2cdc1d0 100644
--- a/room/migration/build.gradle
+++ b/room/migration/build.gradle
@@ -20,7 +20,8 @@
import androidx.build.AndroidXExtension;
plugins {
- id("SupportJavaLibraryPlugin")
+ id("AndroidXPlugin")
+ id("java")
}
dependencies {
