From a0a1d5ca4d5ea422f744fd9e1972069f538ec25b Mon Sep 17 00:00:00 2001 From: Rafael Winterhalter Date: Thu, 8 Sep 2022 16:19:43 +0200 Subject: [PATCH] [release] Remove unused dependencies. --- .../README.md | 0 .../aar-bytebuddy-plugin/build.gradle | 0 .../src/main/AndroidManifest.xml | 0 .../bytebuddy/plugin/gradle/test/aar/AarAdvice.java | 0 .../bytebuddy/plugin/gradle/test/aar/AarPlugin.java | 0 .../plugin/gradle/test/aar/package-info.java | 0 .../resources/META-INF/net.bytebuddy/build.plugins | 0 .../aar-bytebuddy-target/build.gradle | 0 .../src/main/AndroidManifest.xml | 0 .../android/test/aar/lib/SomeAarClass.java | 0 .../android/test/aar/lib/package-info.java | 0 .../android/test/ByteBuddyInstrumentedTest.java | 0 .../app/src/main/AndroidManifest.xml | 0 .../net/bytebuddy/android/test/AnotherClass.java | 0 .../net/bytebuddy/android/test/MainActivity.java | 0 .../java/net/bytebuddy/android/test/SomeClass.java | 0 .../net/bytebuddy/android/test/package-info.java | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.webp | Bin .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/themes.xml | 0 .../build.gradle | 0 .../jar-bytebuddy-plugin/build.gradle | 0 .../bytebuddy/plugin/gradle/test/jar/JarAdvice.java | 0 .../bytebuddy/plugin/gradle/test/jar/JarPlugin.java | 0 .../plugin/gradle/test/jar/package-info.java | 0 .../resources/META-INF/net.bytebuddy/build.plugins | 0 .../android-plugin/build.gradle | 4 ---- byte-buddy-gradle-plugin/settings.gradle | 10 +++++----- 31 files changed, 5 insertions(+), 9 deletions(-) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/README.md (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/build.gradle (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/src/main/AndroidManifest.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarPlugin.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/package-info.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-target/build.gradle (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-target/src/main/AndroidManifest.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/SomeAarClass.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/package-info.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/AndroidManifest.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/java/net/bytebuddy/android/test/AnotherClass.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/java/net/bytebuddy/android/test/MainActivity.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/java/net/bytebuddy/android/test/SomeClass.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/java/net/bytebuddy/android/test/package-info.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/layout/activity_main.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/values/colors.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/values/strings.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/app/src/main/res/values/themes.xml (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/build.gradle (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/jar-bytebuddy-plugin/build.gradle (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/package-info.java (100%) rename byte-buddy-gradle-plugin/{android-application-test => android-plugin-test}/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins (100%) diff --git a/byte-buddy-gradle-plugin/android-application-test/README.md b/byte-buddy-gradle-plugin/android-plugin-test/README.md similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/README.md rename to byte-buddy-gradle-plugin/android-plugin-test/README.md diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/build.gradle similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/build.gradle rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/build.gradle diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/AndroidManifest.xml b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/AndroidManifest.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/AndroidManifest.xml rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/AndroidManifest.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarPlugin.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarPlugin.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarPlugin.java rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarPlugin.java diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/package-info.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/package-info.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/package-info.java rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/package-info.java diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/build.gradle rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/AndroidManifest.xml b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/AndroidManifest.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/AndroidManifest.xml rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/AndroidManifest.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/SomeAarClass.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/SomeAarClass.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/SomeAarClass.java rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/SomeAarClass.java diff --git a/byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/package-info.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/package-info.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/package-info.java rename to byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/package-info.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/AndroidManifest.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/AndroidManifest.xml rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/AnotherClass.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/AnotherClass.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/AnotherClass.java rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/AnotherClass.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/SomeClass.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/SomeClass.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/SomeClass.java rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/SomeClass.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/package-info.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/package-info.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/java/net/bytebuddy/android/test/package-info.java rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/package-info.java diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/layout/activity_main.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/layout/activity_main.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/layout/activity_main.xml rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/layout/activity_main.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/colors.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/colors.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/colors.xml rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/colors.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/strings.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/strings.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/strings.xml rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/strings.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/themes.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/themes.xml similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/app/src/main/res/values/themes.xml rename to byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/themes.xml diff --git a/byte-buddy-gradle-plugin/android-application-test/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/build.gradle similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/build.gradle rename to byte-buddy-gradle-plugin/android-plugin-test/build.gradle diff --git a/byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/build.gradle similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/build.gradle rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/build.gradle diff --git a/byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java diff --git a/byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java diff --git a/byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/package-info.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/package-info.java similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/package-info.java rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/package-info.java diff --git a/byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins similarity index 100% rename from byte-buddy-gradle-plugin/android-application-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins diff --git a/byte-buddy-gradle-plugin/android-plugin/build.gradle b/byte-buddy-gradle-plugin/android-plugin/build.gradle index b58f9be9a11..bb2ce9c10f8 100644 --- a/byte-buddy-gradle-plugin/android-plugin/build.gradle +++ b/byte-buddy-gradle-plugin/android-plugin/build.gradle @@ -15,8 +15,4 @@ repositories { dependencies { api gradleApi() compileOnly group: 'com.android.tools.build', name: 'gradle', version: '7.2.0' - testImplementation group: 'junit', name: 'junit', version: outerPom.properties.'version.junit' - testImplementation(group: 'org.mockito', name: 'mockito-core', version: outerPom.properties.'version.mockito') { - exclude group: 'net.bytebuddy' - } } diff --git a/byte-buddy-gradle-plugin/settings.gradle b/byte-buddy-gradle-plugin/settings.gradle index 06fa58c50c3..b384bcba32b 100644 --- a/byte-buddy-gradle-plugin/settings.gradle +++ b/byte-buddy-gradle-plugin/settings.gradle @@ -11,10 +11,10 @@ if (!raw.startsWith("1.") && raw.contains(".")) { if (current > JavaVersion.VERSION_1_7 && current != JavaVersion.VERSION_1_9) { include "android-plugin" if (Boolean.getBoolean("net.bytebuddy.build.gradle.android.test")) { - include "android-application-test" - include "android-application-test:app" - include "android-application-test:aar-bytebuddy-target" - include "android-application-test:aar-bytebuddy-plugin" - include "android-application-test:jar-bytebuddy-plugin" + include "android-plugin-test" + include "android-plugin-test:app" + include "android-plugin-test:aar-bytebuddy-target" + include "android-plugin-test:aar-bytebuddy-plugin" + include "android-plugin-test:jar-bytebuddy-plugin" } }