diff options
| author | Dmitry Jemerov <intelliyole@gmail.com> | 2016-03-31 16:15:35 +0200 |
|---|---|---|
| committer | Dmitry Jemerov <intelliyole@gmail.com> | 2016-03-31 16:15:35 +0200 |
| commit | 3ed824ed77e87b09fc997189b74f1201e6e03b14 (patch) | |
| tree | d2ec3d9a0889079bbf82b8ad82ea31dd69f59915 | |
| parent | 6051ab5051be76d6c830a9996901bfbb9e1f901e (diff) | |
| parent | 908aa606ea7c46346b590aaee79dd6cc1851e36d (diff) | |
| download | dokka-3ed824ed77e87b09fc997189b74f1201e6e03b14.tar.gz dokka-3ed824ed77e87b09fc997189b74f1201e6e03b14.tar.bz2 dokka-3ed824ed77e87b09fc997189b74f1201e6e03b14.zip | |
Merge pull request #64 from porokoro/android-and-custom-sources
Android support and custom sources
84 files changed, 8340 insertions, 638 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c928ac74..1e9211e0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -25,6 +25,12 @@ </profile> </annotationProcessing> <bytecodeTargetLevel> + <module name="core_main" target="1.5" /> + <module name="core_test" target="1.5" /> + <module name="dokka-android-gradle-plugin_main" target="1.6" /> + <module name="dokka-android-gradle-plugin_test" target="1.6" /> + <module name="dokka-gradle-plugin_main" target="1.6" /> + <module name="dokka-gradle-plugin_test" target="1.6" /> <module name="dokka-maven-plugin" target="1.5" /> <module name="maven-plugin" target="1.5" /> </bytecodeTargetLevel> diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 3d03cd3a..2e481f64 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,17 +10,11 @@ <set> <option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$/core" /> + <option value="$PROJECT_DIR$/dokka-android-gradle-plugin" /> <option value="$PROJECT_DIR$/dokka-gradle-plugin" /> </set> </option> <option name="useAutoImport" value="true" /> - <option name="myModules"> - <set> - <option value="$PROJECT_DIR$" /> - <option value="$PROJECT_DIR$/core" /> - <option value="$PROJECT_DIR$/dokka-gradle-plugin" /> - </set> - </option> </GradleProjectSettings> </option> </component> 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 new file mode 100644 index 00000000..5481d5a2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.databinding:baseLibrary:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.0.0-beta7/2325d4602c5bce35bc23a85d02e90cbf8ff5357c/baseLibrary-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/baseLibrary/2.0.0-beta7/f9506f402c6930f26792ccc2038210d81ec8ed76/baseLibrary-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..49f396f4 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.databinding:compilerCommon:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.0.0-beta7/615a8977a126f0d45e5b767c703a344050775989/compilerCommon-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/2.0.0-beta7/6df5651b206d22c90a339f2fa29f5889b22ff43f/compilerCommon-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..18733c33 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools:annotations:25.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.0.0-beta7/3692c18c9dff1c8145738c6d7996b6848c30d2b8/annotations-25.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/25.0.0-beta7/ddd06d2f82da9e471cb84f5480f2d0d547f7dba4/annotations-25.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..9f404f1c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:builder:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/2.0.0-beta7/2e3cd1f03aed211f377ca69cfae73811dc163db6/builder-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/2.0.0-beta7/4b4baa9b7928abeaf1bf1fea0b8d789c2a538c4b/builder-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..ead74841 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:builder-model:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/2.0.0-beta7/c541493c0e0050e818a9beeb8e76004fe04733fd/builder-model-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/2.0.0-beta7/b371bb025415156b1549da4989e6828ea82c9320/builder-model-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..3a56673e --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:builder-test-api:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/2.0.0-beta7/a0f6d64d2ed266554e5b89636fdfe252f2c2b00b/builder-test-api-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/2.0.0-beta7/f509970679a5163a290c1f66cbe59b729ad19df3/builder-test-api-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..f1f9c0e2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:gradle:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/2.0.0-beta7/ace39f854e5fb87d3753ee36548228a4558d6b63/gradle-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/2.0.0-beta7/420e4abef10a7204ea01688acb9a60096244529f/gradle-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..972a6ef7 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:gradle-api:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/2.0.0-beta7/784eda8a2990d4f2c95aa684a6805350e5d2214d/gradle-api-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/2.0.0-beta7/34552710d4ef2d8db53af8122c5f794f2d0320b3/gradle-api-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..a51eb9e8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:gradle-core:2.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/2.0.0-beta7/b9cfbb6b7b59f4964f12125465745f165661d2b8/gradle-core-2.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/2.0.0-beta7/c660abedf5f0dfa26b35d786cae4ba2a5629ef57/gradle-core-2.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ 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 new file mode 100644 index 00000000..c14022f3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: com.android.tools.build:manifest-merger:25.0.0-beta7"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/25.0.0-beta7/8cb68a7bdca008a4a0622d16396eacd8105ede27/manifest-merger-25.0.0-beta7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/25.0.0-beta7/b66634b1d7e65b87aaab618866af4810c7756669/manifest-merger-25.0.0-beta7-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file |
