Tests of import with latest gradle plugin are implemented

2019-11-13 20:11:32 +03:00
parent 51590ef1b7
commit e963b71921
43 changed files with 271 additions and 187 deletions
@@ -6,6 +6,7 @@ buildscript {
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.0'
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        {{extraPluginDependencies}}
    }
 }

@@ -4,6 +4,7 @@ buildscript {
    }
    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }
 apply plugin: 'kotlin-multiplatform'
@@ -4,6 +4,7 @@ buildscript {
 	}
 	dependencies {
 		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+		{{extraPluginDependencies}}
 	}
 }

@@ -10,6 +10,7 @@ buildscript {
    dependencies {
        classpath 'com.android.tools.build:gradle:3.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
    }
 }

@@ -4,6 +4,7 @@ buildscript {
    }
    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -1,7 +1,14 @@
-plugins {
-    id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}' apply false
+buildscript {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
+        {{extraPluginDependencies}}
+    }
 }

+
 allprojects {
    repositories {
        {{kotlin_plugin_repositories}}
@@ -1,10 +1,20 @@
-plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
-}
-repositories {
-    {{kotlin_plugin_repositories}}
+buildscript {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+                {{extraPluginDependencies}}
+    }
 }

+allprojects {
+    repositories {
+        {{kotlin_plugin_repositories}}
+    }
+}
+
+apply plugin: 'kotlin-multiplatform'

 group 'com.example'
 version '0.0.1'
@@ -1,9 +1,2 @@
-pluginManagement {
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
 rootProject.name = 'project'
-
-
 enableFeaturePreview('GRADLE_METADATA')
@@ -6,6 +6,7 @@ buildscript {
    }
    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        {{extraPluginDependencies}}
    }

 }
@@ -1,4 +1,4 @@
-kotlin_version = 1.3.40
+kotlin_version = {{kotlin_plugin_version}}
 coroutines_version = 1.1.1
 moowork_node = 1.2.0

@@ -1,23 +1,6 @@
 version '1.0.0'

 apply plugin: 'kotlin-multiplatform'
-apply plugin: 'maven-publish'
-apply plugin: 'kotlin-allopen'
-apply plugin: 'kotlin-noarg'
-
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
-    }
-    repositories {
-        {{kotlin_plugin_repositories}}
-    }
-}
-
-repositories {
-    {{kotlin_plugin_repositories}}
-}

 kotlin {
    jvm {
@@ -4,6 +4,7 @@ buildscript {
    }
    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+                {{extraPluginDependencies}}
    }
 }

@@ -12,10 +13,8 @@ repositories {
    {{kotlin_plugin_repositories}}
 }

-
 apply plugin: 'kotlin-multiplatform'

-
 kotlin {
    jvm()
    js()
@@ -5,6 +5,7 @@ subprojects {
        }
        dependencies {
            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
+            {{extraPluginDependencies}}
        }
    }
 
@@ -4,6 +4,7 @@ buildscript {
    }
    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -5,6 +5,7 @@ buildscript {

    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }

@@ -4,6 +4,7 @@ buildscript {
    }
    dependencies {
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
+        {{extraPluginDependencies}}
    }
 }