Merge branch 'dev-0.11.0'

3 files changed, 0 insertions, 56 deletions

diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
deleted file mode 100644
index b1ee52ab..00000000
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-buildscript {
-    dependencies {
-        classpath "com.android.tools.build:gradle:$abt_plugin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
-    }
-}
-
-
-plugins {
-    id 'org.jetbrains.dokka'
-}
-
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-
-android {
-    compileSdkVersion Integer.parseInt(sdk_version)
-    buildToolsVersion abt_version
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-}
-
-dependencies {
-    api(project(":jlib"))
-    dokkaRuntime files(dokka_fatjar)
-}
-
-dokka {
-    configuration {
-        externalDocumentationLink {
-            url = new URL("https://example.com")
-            packageListUrl = file("$rootDir/package-list").toURI().toURL()
-        }
-    }
-}
\ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
deleted file mode 100644
index 267f6efd..00000000
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="example">
-</manifest>
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt
deleted file mode 100644
index d034a3a9..00000000
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package example
-
-import example.jlib.LibClz
-
-/**
- * Uses jlib
- */
-class LibClzUse {
-    /**
-     * Returns LibClz
-     */
-    fun f(): LibClz = LibClz()
-}
\ No newline at end of file