From 769701f99a1aefbc9d385c1938c9c7d3a7b2e38e Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 1 Nov 2016 02:10:32 +0300 Subject: Total build refactoring, prepare for new development iteration Removed old and useless build helpers Remove old .xml's from .idea and add .idea/shelf to .gitignore build-docs.xml fixed, dokka_version set to 0.9.10 --- .gitignore | 92 +- .idea/ant.xml | 16 - .idea/compiler.xml | 23 + .idea/gradle.xml | 11 +- ...android_databinding_baseLibrary_2_0_0_beta7.xml | 11 - ...roid_databinding_compilerCommon_2_0_0_beta7.xml | 11 - ..._com_android_tools_annotations_25_0_0_beta7.xml | 11 - ...com_android_tools_build_builder_2_0_0_beta7.xml | 11 - ...droid_tools_build_builder_model_2_0_0_beta7.xml | 11 - ...id_tools_build_builder_test_api_2_0_0_beta7.xml | 11 - ..._com_android_tools_build_gradle_2_0_0_beta7.xml | 11 - ..._android_tools_build_gradle_api_2_0_0_beta7.xml | 11 - ...android_tools_build_gradle_core_2_0_0_beta7.xml | 11 - ...id_tools_build_manifest_merger_25_0_0_beta7.xml | 11 - ...adle__com_android_tools_common_25_0_0_beta7.xml | 11 - ..._com_android_tools_ddms_ddmlib_25_0_0_beta7.xml | 11 - ...radle__com_android_tools_dvlib_25_0_0_beta7.xml | 11 - ..._tools_layoutlib_layoutlib_api_25_0_0_beta7.xml | 11 - ...e__com_android_tools_lint_lint_25_0_0_beta7.xml | 11 - ...om_android_tools_lint_lint_api_25_0_0_beta7.xml | 11 - ...android_tools_lint_lint_checks_25_0_0_beta7.xml | 11 - ...__com_android_tools_repository_25_0_0_beta7.xml | 11 - ...__com_android_tools_sdk_common_25_0_0_beta7.xml | 11 - ...adle__com_android_tools_sdklib_25_0_0_beta7.xml | 11 - .../Gradle__com_google_guava_guava_16_0_1.xml | 11 - .../Gradle__com_google_guava_guava_17_0.xml | 11 - .../Gradle__com_google_inject_guice_4_0.xml | 11 - .idea/libraries/Gradle__junit_junit_4_11.xml | 11 - .idea/libraries/Gradle__junit_junit_4_12.xml | 1 - ...org_jetbrains_kotlin_kotlin_runtime_1_0_1_2.xml | 11 - ...e__org_jetbrains_kotlin_kotlin_test_1_0_1_2.xml | 11 - ..._jetbrains_kotlin_kotlin_test_junit_1_0_1_2.xml | 11 - ...rg_apache_maven_maven_aether_provider_3_0_5.xml | 14 - ...aven__org_apache_maven_maven_artifact_3_0_5.xml | 14 - .../Maven__org_apache_maven_maven_core_3_0_5.xml | 14 - .../Maven__org_apache_maven_maven_model_3_0_5.xml | 14 - ..._org_apache_maven_maven_model_builder_3_0_5.xml | 14 - ...en__org_apache_maven_maven_plugin_api_3_0_5.xml | 14 - ...pache_maven_maven_repository_metadata_3_0_5.xml | 14 - ...aven__org_apache_maven_maven_settings_3_0_5.xml | 14 - ...g_apache_maven_maven_settings_builder_3_0_5.xml | 14 - ...n_plugin_tools_maven_plugin_annotations_3_4.xml | 14 - ..._org_codehaus_plexus_plexus_classworlds_2_4.xml | 14 - ...s_plexus_plexus_component_annotations_1_5_5.xml | 14 - ...g_codehaus_plexus_plexus_interpolation_1_14.xml | 14 - ...en__org_codehaus_plexus_plexus_utils_3_0_22.xml | 14 - ...aven__org_sonatype_aether_aether_api_1_13_1.xml | 14 - ...ven__org_sonatype_aether_aether_impl_1_13_1.xml | 14 - ...aven__org_sonatype_aether_aether_spi_1_13_1.xml | 14 - ...ven__org_sonatype_aether_aether_util_1_13_1.xml | 14 - ...aven__org_sonatype_plexus_plexus_cipher_1_4.xml | 14 - ...g_sonatype_plexus_plexus_sec_dispatcher_1_3.xml | 14 - .../Maven__org_sonatype_sisu_sisu_guava_0_9_9.xml | 14 - ...__org_sonatype_sisu_sisu_guice_no_aop_3_1_0.xml | 14 - ...n__org_sonatype_sisu_sisu_inject_bean_2_3_0.xml | 14 - ..._org_sonatype_sisu_sisu_inject_plexus_2_3_0.xml | 14 - .idea/libraries/ant_1_9_4.xml | 9 - .idea/libraries/asm.xml | 9 - .idea/libraries/cli_parser.xml | 9 - .idea/libraries/com_google_inject_guice_4_0.xml | 16 - .idea/libraries/guava.xml | 9 - .idea/libraries/intellij_core_analysis.xml | 9 - .idea/libraries/jansi.xml | 9 - .idea/libraries/jdom.xml | 9 - .idea/libraries/jps_model.xml | 9 - .idea/libraries/jsoup.xml | 11 - .idea/libraries/junit_junit_4_11.xml | 19 - .idea/libraries/kotlin.xml | 12 - .idea/libraries/kotlin_for_upsource.xml | 47 - .idea/libraries/markdown.xml | 9 - .idea/misc.xml | 13 +- .idea/modules.xml | 28 +- .idea/modules/buildSrc.iml | 12 + .idea/modules/buildSrc_main.iml | 2013 +++++++++++++++++++ .idea/modules/buildSrc_test.iml | 2015 +++++++++++++++++++ .idea/modules/core/core.iml | 2 +- .idea/modules/core/core_main.iml | 139 +- .idea/modules/core/core_test.iml | 128 +- .../dokka-android-gradle-plugin.iml | 12 - .../dokka-android-gradle-plugin_main.iml | 2048 ------------------- .../dokka-android-gradle-plugin_test.iml | 2052 -------------------- .../dokka-gradle-plugin/dokka-gradle-plugin.iml | 12 - .../dokka-gradle-plugin_main.iml | 1994 ------------------- .../dokka-gradle-plugin_test.iml | 1998 ------------------- .idea/modules/dokka.iml | 2 +- .../android-gradle-plugin.iml | 12 + .../android-gradle-plugin_main.iml | 1643 ++++++++++++++++ .../android-gradle-plugin_test.iml | 1647 ++++++++++++++++ .idea/modules/runners/ant/ant.iml | 12 + .idea/modules/runners/ant/ant_main.iml | 116 ++ .idea/modules/runners/ant/ant_test.iml | 118 ++ .idea/modules/runners/cli/cli.iml | 12 + .idea/modules/runners/cli/cli_main.iml | 115 ++ .idea/modules/runners/cli/cli_test.iml | 117 ++ .idea/modules/runners/fatjar/fatjar.iml | 12 + .idea/modules/runners/fatjar/fatjar_main.iml | 117 ++ .idea/modules/runners/fatjar/fatjar_test.iml | 119 ++ .../runners/gradle-plugin/gradle-plugin.iml | 12 + .../runners/gradle-plugin/gradle-plugin_main.iml | 1588 +++++++++++++++ .../runners/gradle-plugin/gradle-plugin_test.iml | 1592 +++++++++++++++ .../modules/runners/maven-plugin/maven-plugin.iml | 12 + .../runners/maven-plugin/maven-plugin_main.iml | 152 ++ .../runners/maven-plugin/maven-plugin_test.iml | 151 ++ .idea/modules/runners/runners.iml | 12 + build-docs.xml | 3 +- build.gradle | 84 +- build.xml | 132 -- buildSrc/build.gradle | 14 + .../org/jetbrains/PluginXmlTransformer.groovy | 63 + core/build.gradle | 165 +- core/gradlew | 164 -- core/gradlew.bat | 90 - core/settings.gradle | 1 - core/src/main/kotlin/Generation/DokkaGenerator.kt | 158 ++ core/src/main/kotlin/Utilities/DokkaLogging.kt | 27 + core/src/main/kotlin/ant/dokka.kt | 101 - core/src/main/kotlin/main.kt | 271 --- dokka-android-gradle-plugin/build.gradle | 71 - dokka-android-gradle-plugin/settings.gradle | 2 - .../src/main/kotlin/main.kt | 76 - .../org.jetbrains.dokka-android.properties | 1 - dokka-gradle-plugin/build.gradle | 68 - dokka-gradle-plugin/settings.gradle | 2 - dokka-gradle-plugin/src/main/kotlin/logger.kt | 18 - dokka-gradle-plugin/src/main/kotlin/main.kt | 190 -- .../gradle-plugins/org.jetbrains.dokka.properties | 1 - dokka.pro | 100 - gradle.properties | 15 +- lib/javax.inject-1.jar | Bin 2497 -> 0 bytes maven-plugin/dokka-maven-plugin.iml | 46 - maven-plugin/pom.xml | 181 -- maven-plugin/src/main/kotlin/DokkaMojo.kt | 179 -- maven-plugin/src/main/kotlin/MavenDokkaLogger.kt | 18 - runners/android-gradle-plugin/build.gradle | 57 + .../android-gradle-plugin/src/main/kotlin/main.kt | 76 + .../org.jetbrains.dokka-android.properties | 1 + runners/ant/build.gradle | 16 + runners/ant/src/main/kotlin/ant/dokka.kt | 101 + runners/build.gradle | 9 + runners/cli/build.gradle | 6 + runners/cli/src/main/kotlin/cli/main.kt | 92 + runners/fatjar/build.gradle | 62 + runners/gradle-plugin/build.gradle | 58 + runners/gradle-plugin/src/main/kotlin/logger.kt | 18 + runners/gradle-plugin/src/main/kotlin/main.kt | 190 ++ .../gradle-plugins/org.jetbrains.dokka.properties | 1 + runners/maven-plugin/build.gradle | 80 + runners/maven-plugin/pom.tpl.xml | 26 + runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 179 ++ .../src/main/kotlin/MavenDokkaLogger.kt | 18 + settings.gradle | 2 +- 151 files changed, 13099 insertions(+), 11123 deletions(-) delete mode 100755 .idea/ant.xml delete mode 100644 .idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml delete mode 100644 .idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml delete mode 100644 .idea/libraries/Gradle__com_google_guava_guava_17_0.xml delete mode 100644 .idea/libraries/Gradle__com_google_inject_guice_4_0.xml delete mode 100644 .idea/libraries/Gradle__junit_junit_4_11.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_1_2.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_1_2.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_1_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_artifact_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_core_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_4.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_4.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_14.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_22.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_api_1_13_1.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_impl_1_13_1.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_spi_1_13_1.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_util_1_13_1.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_guava_0_9_9.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_guice_no_aop_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_2_3_0.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_2_3_0.xml delete mode 100644 .idea/libraries/ant_1_9_4.xml delete mode 100644 .idea/libraries/asm.xml delete mode 100644 .idea/libraries/cli_parser.xml delete mode 100644 .idea/libraries/com_google_inject_guice_4_0.xml delete mode 100644 .idea/libraries/guava.xml delete mode 100644 .idea/libraries/intellij_core_analysis.xml delete mode 100644 .idea/libraries/jansi.xml delete mode 100644 .idea/libraries/jdom.xml delete mode 100644 .idea/libraries/jps_model.xml delete mode 100644 .idea/libraries/jsoup.xml delete mode 100644 .idea/libraries/junit_junit_4_11.xml delete mode 100644 .idea/libraries/kotlin.xml delete mode 100644 .idea/libraries/kotlin_for_upsource.xml delete mode 100644 .idea/libraries/markdown.xml create mode 100644 .idea/modules/buildSrc.iml create mode 100644 .idea/modules/buildSrc_main.iml create mode 100644 .idea/modules/buildSrc_test.iml delete mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin.iml delete mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin_main.iml delete mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin_test.iml delete mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin.iml delete mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin_main.iml delete mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin_test.iml create mode 100644 .idea/modules/runners/android-gradle-plugin/android-gradle-plugin.iml create mode 100644 .idea/modules/runners/android-gradle-plugin/android-gradle-plugin_main.iml create mode 100644 .idea/modules/runners/android-gradle-plugin/android-gradle-plugin_test.iml create mode 100644 .idea/modules/runners/ant/ant.iml create mode 100644 .idea/modules/runners/ant/ant_main.iml create mode 100644 .idea/modules/runners/ant/ant_test.iml create mode 100644 .idea/modules/runners/cli/cli.iml create mode 100644 .idea/modules/runners/cli/cli_main.iml create mode 100644 .idea/modules/runners/cli/cli_test.iml create mode 100644 .idea/modules/runners/fatjar/fatjar.iml create mode 100644 .idea/modules/runners/fatjar/fatjar_main.iml create mode 100644 .idea/modules/runners/fatjar/fatjar_test.iml create mode 100644 .idea/modules/runners/gradle-plugin/gradle-plugin.iml create mode 100644 .idea/modules/runners/gradle-plugin/gradle-plugin_main.iml create mode 100644 .idea/modules/runners/gradle-plugin/gradle-plugin_test.iml create mode 100644 .idea/modules/runners/maven-plugin/maven-plugin.iml create mode 100644 .idea/modules/runners/maven-plugin/maven-plugin_main.iml create mode 100644 .idea/modules/runners/maven-plugin/maven-plugin_test.iml create mode 100644 .idea/modules/runners/runners.iml delete mode 100644 build.xml create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/src/main/groovy/org/jetbrains/PluginXmlTransformer.groovy delete mode 100755 core/gradlew delete mode 100644 core/gradlew.bat create mode 100644 core/src/main/kotlin/Generation/DokkaGenerator.kt create mode 100644 core/src/main/kotlin/Utilities/DokkaLogging.kt delete mode 100644 core/src/main/kotlin/ant/dokka.kt delete mode 100644 core/src/main/kotlin/main.kt delete mode 100644 dokka-android-gradle-plugin/build.gradle delete mode 100644 dokka-android-gradle-plugin/settings.gradle delete mode 100644 dokka-android-gradle-plugin/src/main/kotlin/main.kt delete mode 100644 dokka-android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties delete mode 100644 dokka-gradle-plugin/build.gradle delete mode 100644 dokka-gradle-plugin/settings.gradle delete mode 100644 dokka-gradle-plugin/src/main/kotlin/logger.kt delete mode 100644 dokka-gradle-plugin/src/main/kotlin/main.kt delete mode 100644 dokka-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka.properties delete mode 100644 dokka.pro delete mode 100644 lib/javax.inject-1.jar delete mode 100644 maven-plugin/dokka-maven-plugin.iml delete mode 100644 maven-plugin/pom.xml delete mode 100644 maven-plugin/src/main/kotlin/DokkaMojo.kt delete mode 100644 maven-plugin/src/main/kotlin/MavenDokkaLogger.kt create mode 100644 runners/android-gradle-plugin/build.gradle create mode 100644 runners/android-gradle-plugin/src/main/kotlin/main.kt create mode 100644 runners/android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties create mode 100644 runners/ant/build.gradle create mode 100644 runners/ant/src/main/kotlin/ant/dokka.kt create mode 100644 runners/build.gradle create mode 100644 runners/cli/build.gradle create mode 100644 runners/cli/src/main/kotlin/cli/main.kt create mode 100644 runners/fatjar/build.gradle create mode 100644 runners/gradle-plugin/build.gradle create mode 100644 runners/gradle-plugin/src/main/kotlin/logger.kt create mode 100644 runners/gradle-plugin/src/main/kotlin/main.kt create mode 100644 runners/gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka.properties create mode 100644 runners/maven-plugin/build.gradle create mode 100644 runners/maven-plugin/pom.tpl.xml create mode 100644 runners/maven-plugin/src/main/kotlin/DokkaMojo.kt create mode 100644 runners/maven-plugin/src/main/kotlin/MavenDokkaLogger.kt diff --git a/.gitignore b/.gitignore index ecd04811..b57931b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,88 @@ -/.idea/workspace.xml -out + doc -target -build -.gradle \ No newline at end of file +### Maven template +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/shelf +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties +### Gradle template +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +!lib/*.jar \ No newline at end of file diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100755 index 4e95ddbe..00000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1e9211e0..de9f413f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -22,9 +22,22 @@ + + + + + + + + + + + + + @@ -32,7 +45,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2e481f64..4ab91dab 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -9,12 +9,17 @@ - diff --git a/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml deleted file mode 100644 index 5481d5a2..00000000 --- a/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml deleted file mode 100644 index 49f396f4..00000000 --- a/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml deleted file mode 100644 index 18733c33..00000000 --- a/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml deleted file mode 100644 index 9f404f1c..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml deleted file mode 100644 index ead74841..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml deleted file mode 100644 index 3a56673e..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml deleted file mode 100644 index f1f9c0e2..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml deleted file mode 100644 index 972a6ef7..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml deleted file mode 100644 index a51eb9e8..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml deleted file mode 100644 index c14022f3..00000000 --- a/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml deleted file mode 100644 index 2a268a7d..00000000 --- a/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml deleted file mode 100644 index 6dcf3622..00000000 --- a/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml deleted file mode 100644 index e1a23524..00000000 --- a/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml deleted file mode 100644 index 48e9be30..00000000 --- a/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml deleted file mode 100644 index 34fa06ef..00000000 --- a/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml deleted file mode 100644 index 858461ae..00000000 --- a/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml deleted file mode 100644 index 117f5c68..00000000 --- a/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml deleted file mode 100644 index d99ff508..00000000 --- a/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml deleted file mode 100644 index ea6a6cea..00000000 --- a/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml deleted file mode 100644 index ec5e63f5..00000000 --- a/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml b/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml deleted file mode 100644 index 53ca37d2..00000000 --- a/.idea/libraries/Gradle__com_google_guava_guava_16_0_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml deleted file mode 100644 index 0ecc15e1..00000000 --- a/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml b/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml deleted file mode 100644 index 87bea56e..00000000 --- a/.idea/libraries/Gradle__com_google_inject_guice_4_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml deleted file mode 100644 index dc26b345..00000000 --- a/.idea/libraries/Gradle__junit_junit_4_11.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml index 0978f847..04c10dd5 100644 --- a/.idea/libraries/Gradle__junit_junit_4_12.xml +++ b/.idea/libraries/Gradle__junit_junit_4_12.xml @@ -5,7 +5,6 @@ - diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_1_2.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_1_2.xml deleted file mode 100644 index 6e1b47c4..00000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_1_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_1_2.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_1_2.xml deleted file mode 100644 index ef564f5f..00000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_1_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_1_2.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_1_2.xml deleted file mode 100644 index d07770b3..00000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_1_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0_5.xml deleted file mode 100644 index 8045561c..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0_5.xml deleted file mode 100644 index 0267be02..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_core_3_0_5.xml deleted file mode 100644 index 2fdaa3be..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_3_0_5.xml deleted file mode 100644 index f22a2907..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0_5.xml deleted file mode 100644 index fffe6fc5..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0_5.xml deleted file mode 100644 index a3f5de62..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0_5.xml deleted file mode 100644 index e43a45cc..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0_5.xml deleted file mode 100644 index bf513116..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0_5.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0_5.xml deleted file mode 100644 index 70e3a6dc..00000000 --- a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_4.xml b/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_4.xml deleted file mode 100644 index a4eaef16..00000000 --- a/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_4.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_4.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_4.xml deleted file mode 100644 index d7fbbc35..00000000 --- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_4.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml deleted file mode 100644 index f479523d..00000000 --- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_14.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_14.xml deleted file mode 100644 index c3fa79e6..00000000 --- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_14.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_22.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_22.xml deleted file mode 100644 index 40dd204d..00000000 --- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_22.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - -