From fee7fe7fd791170068515987f3b343f83618a21c Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 6 May 2024 17:02:09 -0700 Subject: [PATCH] Remove cruft from samples build.gradle files. This has been cargo culted forward in each sample for who knows how long. Most of these don't use kotlin or the library plugin. The clean task bit I think was a workaround for a very old AGP bug that was in the new app templates, but if I create a new project with AS now, it's no longer included. --- audio-echo/build.gradle | 6 ------ bitmap-plasma/build.gradle | 6 ------ camera/build.gradle | 6 ------ display-p3/build.gradle | 6 ------ endless-tunnel/build.gradle | 6 ------ exceptions/build.gradle | 3 +-- gles3jni/build.gradle | 6 ------ hello-gl2/build.gradle | 6 ------ hello-jni/build.gradle | 5 ----- hello-jniCallback/build.gradle | 6 ------ hello-libs/build.gradle | 6 ------ hello-neon/build.gradle | 6 ------ hello-oboe/build.gradle | 5 ----- native-activity/build.gradle | 6 ------ native-audio/build.gradle | 6 ------ native-codec/build.gradle | 6 ------ native-media/build.gradle | 6 ------ native-midi/build.gradle | 6 ------ native-plasma/build.gradle | 6 ------ nn-samples/build.gradle | 5 ----- prefab/curl-ssl/build.gradle | 5 ----- prefab/prefab-dependency/build.gradle | 5 ----- prefab/prefab-publishing/build.gradle | 6 ------ san-angeles/build.gradle | 6 ------ sanitizers/build.gradle | 2 -- sensor-graph/build.gradle | 6 ------ teapots/build.gradle | 6 ------ unit-test/build.gradle | 1 - webp/build.gradle | 6 ------ 29 files changed, 1 insertion(+), 156 deletions(-) diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle index 878a35cfb..0c6026303 100644 --- a/audio-echo/build.gradle +++ b/audio-echo/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle index 878a35cfb..0c6026303 100644 --- a/bitmap-plasma/build.gradle +++ b/bitmap-plasma/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/camera/build.gradle b/camera/build.gradle index 878a35cfb..0c6026303 100644 --- a/camera/build.gradle +++ b/camera/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/display-p3/build.gradle b/display-p3/build.gradle index 878a35cfb..0c6026303 100644 --- a/display-p3/build.gradle +++ b/display-p3/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle index 878a35cfb..0c6026303 100644 --- a/endless-tunnel/build.gradle +++ b/endless-tunnel/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/exceptions/build.gradle b/exceptions/build.gradle index 6b64603cf..17bea63ad 100644 --- a/exceptions/build.gradle +++ b/exceptions/build.gradle @@ -1,6 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false -} \ No newline at end of file +} diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle index 878a35cfb..0c6026303 100644 --- a/gles3jni/build.gradle +++ b/gles3jni/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle index 878a35cfb..0c6026303 100644 --- a/hello-gl2/build.gradle +++ b/hello-gl2/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle index 878a35cfb..794fd42ba 100644 --- a/hello-jni/build.gradle +++ b/hello-jni/build.gradle @@ -1,10 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-jniCallback/build.gradle b/hello-jniCallback/build.gradle index 878a35cfb..0c6026303 100644 --- a/hello-jniCallback/build.gradle +++ b/hello-jniCallback/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-libs/build.gradle b/hello-libs/build.gradle index 878a35cfb..0c6026303 100644 --- a/hello-libs/build.gradle +++ b/hello-libs/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-neon/build.gradle b/hello-neon/build.gradle index 878a35cfb..0c6026303 100644 --- a/hello-neon/build.gradle +++ b/hello-neon/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/hello-oboe/build.gradle b/hello-oboe/build.gradle index 878a35cfb..794fd42ba 100644 --- a/hello-oboe/build.gradle +++ b/hello-oboe/build.gradle @@ -1,10 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-activity/build.gradle b/native-activity/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-activity/build.gradle +++ b/native-activity/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-audio/build.gradle b/native-audio/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-audio/build.gradle +++ b/native-audio/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-codec/build.gradle b/native-codec/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-codec/build.gradle +++ b/native-codec/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-media/build.gradle b/native-media/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-media/build.gradle +++ b/native-media/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-midi/build.gradle b/native-midi/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-midi/build.gradle +++ b/native-midi/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle index 878a35cfb..0c6026303 100644 --- a/native-plasma/build.gradle +++ b/native-plasma/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/nn-samples/build.gradle b/nn-samples/build.gradle index 878a35cfb..794fd42ba 100644 --- a/nn-samples/build.gradle +++ b/nn-samples/build.gradle @@ -1,10 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/prefab/curl-ssl/build.gradle b/prefab/curl-ssl/build.gradle index 501d31157..54e0a0d26 100644 --- a/prefab/curl-ssl/build.gradle +++ b/prefab/curl-ssl/build.gradle @@ -17,10 +17,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/prefab/prefab-dependency/build.gradle b/prefab/prefab-dependency/build.gradle index 600606707..50452352d 100644 --- a/prefab/prefab-dependency/build.gradle +++ b/prefab/prefab-dependency/build.gradle @@ -17,10 +17,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/prefab/prefab-publishing/build.gradle b/prefab/prefab-publishing/build.gradle index 600606707..7fa8f56e0 100644 --- a/prefab/prefab-publishing/build.gradle +++ b/prefab/prefab-publishing/build.gradle @@ -17,10 +17,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle index 878a35cfb..0c6026303 100644 --- a/san-angeles/build.gradle +++ b/san-angeles/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/sanitizers/build.gradle b/sanitizers/build.gradle index 9e8c6a2c4..0c6026303 100644 --- a/sanitizers/build.gradle +++ b/sanitizers/build.gradle @@ -1,6 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } diff --git a/sensor-graph/build.gradle b/sensor-graph/build.gradle index 878a35cfb..0c6026303 100644 --- a/sensor-graph/build.gradle +++ b/sensor-graph/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/teapots/build.gradle b/teapots/build.gradle index 878a35cfb..0c6026303 100755 --- a/teapots/build.gradle +++ b/teapots/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file diff --git a/unit-test/build.gradle b/unit-test/build.gradle index 389f91910..10497ef71 100644 --- a/unit-test/build.gradle +++ b/unit-test/build.gradle @@ -1,6 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } \ No newline at end of file diff --git a/webp/build.gradle b/webp/build.gradle index 878a35cfb..0c6026303 100644 --- a/webp/build.gradle +++ b/webp/build.gradle @@ -1,10 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '8.4.0' apply false - id 'com.android.library' version '8.4.0' apply false - id 'org.jetbrains.kotlin.android' version '1.7.21' apply false } - -task clean(type: Delete) { - delete rootProject.buildDir -} \ No newline at end of file