Remove separate app-toolkit project
Test: none
Change-Id: I508928e9c99ee8f3ff8a7e42617bf725b228f3ae
diff --git a/.gitignore b/.gitignore
index 40971ae..b85a0d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@
# When Gradle configuration fails with the --profile option enabled it creates this folder.
/reports
-/app-toolkit/reports
diff --git a/app-toolkit/.gitignore b/app-toolkit/.gitignore
deleted file mode 100644
index be4e6f1..0000000
--- a/app-toolkit/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-local.properties
-maven-repo/
-build/
-*.DS_Store
diff --git a/app-toolkit/.idea/codeStyleSettings.xml b/app-toolkit/.idea/codeStyleSettings.xml
deleted file mode 120000
index 13e0b76..0000000
--- a/app-toolkit/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../.idea/codeStyleSettings.xml
\ No newline at end of file
diff --git a/app-toolkit/.idea/copyright b/app-toolkit/.idea/copyright
deleted file mode 120000
index 51a82b0..0000000
--- a/app-toolkit/.idea/copyright
+++ /dev/null
@@ -1 +0,0 @@
-../../.idea/copyright
\ No newline at end of file
diff --git a/app-toolkit/OWNERS b/app-toolkit/OWNERS
deleted file mode 100644
index fc51372..0000000
--- a/app-toolkit/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
[email protected]
[email protected]
\ No newline at end of file
diff --git a/app-toolkit/README.md b/app-toolkit/README.md
deleted file mode 100644
index e36944f..0000000
--- a/app-toolkit/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a wrapper project for flatfoot projects.
-You can use either individual projects or this one.
-Build server uses this project to build flatfoot.
\ No newline at end of file
diff --git a/app-toolkit/build.gradle b/app-toolkit/build.gradle
deleted file mode 100644
index cdad92c..0000000
--- a/app-toolkit/build.gradle
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-import androidx.build.AndroidXPlugin
-import androidx.build.DacOptions
-import androidx.build.PublishDocsRulesKt
-
-rootProject.tasks.whenTaskAdded { task ->
- if ("dejetifyArchive".equals(task.name)) {
- task.enabled = false
- }
-}
-
-def currentJvmVersion = org.gradle.api.JavaVersion.current()
-if (currentJvmVersion.getMajorVersion() != "8") {
- throw new Exception("Unsupported java version '" + currentJvmVersion.toString() + "'. Please install java 8.\n" +
-"\n" +
-"If you have already installed java 8, you can instruct Gradle to use it by setting the environment variable JAVA_HOME equal to its file path.")
-}
-
-
-buildscript {
- ext.supportRootFolder = new File(project.projectDir, "..")
- apply from: 'buildSrc/repos.gradle'
- apply from: 'buildSrc/init.gradle'
- apply from: 'buildSrc/build_dependencies.gradle'
- init.setSdkInLocalPropertiesFile()
- repos.addMavenRepositories(repositories)
-
- dependencies {
- classpath build_libs.gradle
- classpath build_libs.jacoco
- classpath build_libs.kotlin.gradle_plugin
- }
-}
-
-repos.addMavenRepositories(repositories)
-
-init.setupRepoOutAndBuildNumber()
-
-init.configureSubProjects()
-
-def buildTask = init.configureBuildOnServer()
-
-apply plugin: AndroidXPlugin
-
-// AndroidX needed before jetify since it accesses the createArchive task name directly.
-apply from: 'buildSrc/jetify.gradle'
-
-// repository creation task
-def buildServerCompatTask = rootProject.tasks.create(name : "runBuildServerCompilationTasks",
- description: "Anchor task for everything we want to run in build server.") {
- dependsOn buildTask
- }
diff --git a/app-toolkit/buildSrc b/app-toolkit/buildSrc
deleted file mode 120000
index 053a423..0000000
--- a/app-toolkit/buildSrc
+++ /dev/null
@@ -1 +0,0 @@
-../buildSrc
\ No newline at end of file
diff --git a/app-toolkit/gradle b/app-toolkit/gradle
deleted file mode 120000
index 3337596..0000000
--- a/app-toolkit/gradle
+++ /dev/null
@@ -1 +0,0 @@
-../gradle
\ No newline at end of file
diff --git a/app-toolkit/gradle.properties b/app-toolkit/gradle.properties
deleted file mode 120000
index 7677fb7..0000000
--- a/app-toolkit/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-../gradle.properties
\ No newline at end of file
diff --git a/app-toolkit/gradlew b/app-toolkit/gradlew
deleted file mode 120000
index 502f5a2..0000000
--- a/app-toolkit/gradlew
+++ /dev/null
@@ -1 +0,0 @@
-../gradlew
\ No newline at end of file
diff --git a/app-toolkit/settings.gradle b/app-toolkit/settings.gradle
deleted file mode 100644
index bf419f6..0000000
--- a/app-toolkit/settings.gradle
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-// Calling includeProject(name, filePath) is shorthand for:
-//
-// include(name)
-// project(name).projectDir = new File(filePath)
-//
-// Note that <name> directly controls the Gradle project name, and also indirectly sets:
-// the project name in the IDE
-// the Maven artifactId
-//
-def includeProject(name, filePath) {
- settings.include(name)
-
- def file
- if (filePath instanceof String) {
- file = new File(filePath)
- } else {
- file = filePath
- }
- project(name).projectDir = file
-}
-
-// If you change this file, you should also change the settings gradle inside
-// the sub project.
-
-def inAppToolkitProject = rootProject.name == "app-toolkit"
-def supportRoot
-if (inAppToolkitProject) {
- supportRoot = new File(rootProject.projectDir, "..").getCanonicalFile()
-} else {
- supportRoot = rootProject.projectDir
-}
-
-println "support root:${supportRoot}"
-
-includeProject(":arch:core-common", new File(supportRoot, "arch/core-common"))
-includeProject(":arch:core-testing", new File(supportRoot, "arch/core-testing"))
-includeProject(":arch:core-runtime", new File(supportRoot, "arch/core-runtime"))
-includeProject(":lifecycle:integration-tests:testapp", new File(supportRoot, "lifecycle/integration-tests/testapp"))
-includeProject(":lifecycle:lifecycle-common", new File(supportRoot, "lifecycle/common"))
-includeProject(":lifecycle:lifecycle-common-java8", new File(supportRoot, "lifecycle/common-java8"))
-includeProject(":lifecycle:lifecycle-compiler", new File(supportRoot, "lifecycle/compiler"))
-includeProject(":lifecycle:lifecycle-extensions", new File(supportRoot, "lifecycle/extensions"))
-includeProject(":lifecycle:lifecycle-livedata-core", new File(supportRoot, "lifecycle/livedata-core"))
-includeProject(":lifecycle:lifecycle-livedata", new File(supportRoot, "lifecycle/livedata"))
-includeProject(":lifecycle:lifecycle-process", new File(supportRoot, "lifecycle/process"))
-includeProject(":lifecycle:lifecycle-reactivestreams", new File(supportRoot, "lifecycle/reactivestreams"))
-includeProject(":lifecycle:lifecycle-reactivestreams-ktx", new File(supportRoot, "lifecycle/reactivestreams/ktx"))
-includeProject(":lifecycle:lifecycle-runtime", new File(supportRoot, "lifecycle/runtime"))
-includeProject(":lifecycle:lifecycle-service", new File(supportRoot, "lifecycle/service"))
-includeProject(":lifecycle:lifecycle-viewmodel", new File(supportRoot, "lifecycle/viewmodel"))
-includeProject(":lifecycle:lifecycle-viewmodel-ktx", new File(supportRoot, "lifecycle/viewmodel/ktx"))
-includeProject(":lifecycle:lifecycle-savedstate-core", new File(supportRoot, "lifecycle/savedstate-core"))
-includeProject(":lifecycle:lifecycle-savedstate-fragment", new File(supportRoot, "lifecycle/savedstate-fragment"))
-includeProject(":lifecycle:lifecycle-viewmodel-savedstate", new File(supportRoot, "lifecycle/viewmodel-savedstate"))
-includeProject(":lifecycle:lifecycle-viewmodel-fragment", new File(supportRoot, "lifecycle/viewmodel-fragment"))
-includeProject(":paging:integration-tests:testapp", new File(supportRoot, "paging/integration-tests/testapp"))
-includeProject(":paging:paging-common", new File(supportRoot, "paging/common"))
-includeProject(":paging:paging-common-ktx", new File(supportRoot, "paging/common/ktx"))
-includeProject(":paging:paging-runtime", new File(supportRoot, "paging/runtime"))
-includeProject(":paging:paging-runtime-ktx", new File(supportRoot, "paging/runtime/ktx"))
-includeProject(":paging:paging-rxjava2", new File(supportRoot, "paging/rxjava2"))
-includeProject(":paging:paging-rxjava2-ktx", new File(supportRoot, "paging/rxjava2/ktx"))
-includeProject(":room:integration-tests:autovaluetestapp", new File(supportRoot, "room/integration-tests/autovaluetestapp"))
-includeProject(":room:integration-tests:testapp", new File(supportRoot, "room/integration-tests/testapp"))
-includeProject(":room:integration-tests:kotlintestapp", new File(supportRoot, "room/integration-tests/kotlintestapp"))
-includeProject(":room:room-common", new File(supportRoot, "room/common"))
-includeProject(":room:room-compiler", new File(supportRoot, "room/compiler"))
-includeProject(":room:room-guava", new File(supportRoot, "room/guava"))
-includeProject(":room:room-migration", new File(supportRoot, "room/migration"))
-includeProject(":room:room-runtime", new File(supportRoot, "room/runtime"))
-includeProject(":room:room-rxjava2", new File(supportRoot, "room/rxjava2"))
-includeProject(":room:room-testing", new File(supportRoot, "room/testing"))
-includeProject(":sqlite:sqlite", new File(supportRoot, "persistence/db"))
-includeProject(":sqlite:sqlite-framework", new File(supportRoot, "persistence/db-framework"))
-includeProject(":sqlite:sqlite-ktx", new File(supportRoot, "persistence/db/ktx"))
-
-includeProject(":jetifier-core", new File(supportRoot, "jetifier/jetifier/core"))
-includeProject(":jetifier-processor", new File(supportRoot, "jetifier/jetifier/processor"))
-includeProject(":jetifier-gradle-plugin", new File(supportRoot, "jetifier/jetifier/gradle-plugin"))
-includeProject(":jetifier-standalone", new File(supportRoot, "jetifier/jetifier/standalone"))
-includeProject(":jetifier-preprocessor", new File(supportRoot, "jetifier/jetifier/preprocessor"))
-
-includeProject(":navigation:navigation-common", new File(supportRoot, "navigation/common"))
-includeProject(":navigation:navigation-common-ktx", new File(supportRoot, "navigation/common/ktx"))
-includeProject(":navigation:navigation-runtime", new File(supportRoot, "navigation/runtime/"))
-includeProject(":navigation:navigation-runtime-ktx", new File(supportRoot, "navigation/runtime/ktx"))
-includeProject(":navigation:navigation-testing", new File(supportRoot, "navigation/testing"))
-includeProject(":navigation:navigation-testing-ktx", new File(supportRoot, "navigation/testing/ktx"))
-includeProject(":navigation:navigation-fragment", new File(supportRoot, "navigation/fragment"))
-includeProject(":navigation:navigation-fragment-ktx", new File(supportRoot, "navigation/fragment/ktx"))
-includeProject(":navigation:navigation-ui", new File(supportRoot, "navigation/ui"))
-includeProject(":navigation:navigation-ui-ktx", new File(supportRoot, "navigation/ui/ktx"))
-includeProject(":navigation:navigation-integration-tests:testapp", new File(supportRoot, "navigation/integration-tests/testapp"))
-includeProject(":navigation:navigation-safe-args-generator", new File(supportRoot, "navigation/safe-args-generator"))
-includeProject(":navigation:navigation-safe-args-gradle-plugin", new File(supportRoot, "navigation/safe-args-gradle-plugin"))
-
-includeProject(":work:work-runtime", new File(supportRoot, "work/workmanager"))
-includeProject(":work:work-runtime-ktx", new File(supportRoot, "work/workmanager-ktx"))
-includeProject(":work:work-firebase", new File(supportRoot, "work/workmanager-firebase"))
-includeProject(":work:work-testing", new File(supportRoot, "work/workmanager-test"))
-includeProject(":work:integration-tests:testapp", new File(supportRoot, "work/integration-tests/testapp"))
-
-/////////////////////////////
-//
-// External
-//
-/////////////////////////////
-
-apply(from: new File(supportRoot, 'include-composite-deps.gradle'))
-
-// fake project which is used for docs generation from prebuilts
-// we need real android project to generate R.java, aidl etc files that mentioned in sources
-if (!startParameter.projectProperties.containsKey('android.injected.invoked.from.ide')) {
- // we don't need it in ide, so we don't configure it there
- includeProject(":docs-fake", new File(supportRoot, "docs-fake"))
-}
diff --git a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
index ebc13ba..1afcc7e4 100644
--- a/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/AndroidXPlugin.kt
@@ -95,9 +95,7 @@
private fun Project.configureRootProject() {
Release.createGlobalArchiveTask(this)
- val supportRootFolder = if (name == "app-toolkit") projectDir.parentFile else projectDir
-
- val allDocsTask = DiffAndDocs.configureDiffAndDocs(this, supportRootFolder,
+ val allDocsTask = DiffAndDocs.configureDiffAndDocs(this, projectDir,
DacOptions("androidx", "ANDROIDX_DATA"),
listOf(RELEASE_RULE))
diff --git a/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle b/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle
index 0941f4d..3a2b772 100644
--- a/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle
+++ b/navigation/integration-tests/safeargs-testapp/buildSrc/build.gradle
@@ -26,7 +26,7 @@
inputs.files(fileTree(dir: "$supportRootFolder/navigation",
includes: ['**/*.java', '**/*.kt'], exclude: 'integration-tests/*'))
outputs.dir(repoDir)
- workingDir "$supportRootFolder/app-toolkit/"
+ workingDir supportRootFolder
commandLine "./gradlew", "createArchive"
}
diff --git a/navigation/safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/PluginTest.kt b/navigation/safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/PluginTest.kt
index 72845ff..9a85dd3 100644
--- a/navigation/safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/PluginTest.kt
+++ b/navigation/safe-args-gradle-plugin/src/test/kotlin/androidx/navigation/safeargs/gradle/PluginTest.kt
@@ -89,7 +89,7 @@
buildFile = File(projectRoot(), "build.gradle")
buildFile.createNewFile()
// copy local.properties
- val appToolkitProperties = File("../../app-toolkit/local.properties")
+ val appToolkitProperties = File("../../local.properties")
if (appToolkitProperties.exists()) {
appToolkitProperties.copyTo(File(projectRoot(), "local.properties"), overwrite = true)
} else {
