Enable support for writing Kotlin files. (#451)

hborisoff · web-flow · commit 7028dd41e6cb · 2021-06-15T17:40:55.000+03:00
diff --git a/AndroidSDK/build.gradle b/AndroidSDK/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
@@ -15,8 +16,7 @@ allprojects {
 }
 
 dependencies {
-    debugApi project(':AndroidSDKCore')
-    releaseApi project(':AndroidSDKCore')
+    api project(':AndroidSDKCore')
 }
 
 android {
diff --git a/AndroidSDKCore/build.gradle b/AndroidSDKCore/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
diff --git a/AndroidSDKFcm/build.gradle b/AndroidSDKFcm/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
@@ -29,10 +30,8 @@ android {
 }
 
 dependencies {
-    debugApi project(':AndroidSDKCore')
-    releaseApi project(':AndroidSDKCore')
-    debugApi project(':AndroidSDKPush')
-    releaseApi project(':AndroidSDKPush')
+    api project(':AndroidSDKCore')
+    api project(':AndroidSDKPush')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
     compileOnly('com.google.firebase:firebase-messaging:[17.3.4, 21.1.0]') {
diff --git a/AndroidSDKLocation/build.gradle b/AndroidSDKLocation/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
@@ -29,8 +30,7 @@ android {
 }
 
 dependencies {
-    debugApi project(':AndroidSDKCore')
-    releaseApi project(':AndroidSDKCore')
+    api project(':AndroidSDKCore')
 
     // Provided dependencies are optional dependencies and will not show up in pom file.
     compileOnly('com.google.android.gms:play-services-location:[10.0.0,)') {
diff --git a/AndroidSDKMiPush/build.gradle b/AndroidSDKMiPush/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
@@ -29,10 +30,8 @@ android {
 }
 
 dependencies {
-    debugApi project(':AndroidSDKCore')
-    releaseApi project(':AndroidSDKCore')
-    debugApi project(':AndroidSDKPush')
-    releaseApi project(':AndroidSDKPush')
+    api project(':AndroidSDKCore')
+    api project(':AndroidSDKPush')
 
     // MiPush SDK is located in libs
     implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/AndroidSDKPush/build.gradle b/AndroidSDKPush/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
     id 'com.jfrog.artifactory' version '4.13.0'
     id 'maven-publish'
     id 'signing'
@@ -28,8 +29,7 @@ android {
 }
 
 dependencies {
-    debugApi project(':AndroidSDKCore')
-    releaseApi project(':AndroidSDKCore')
+    api project(':AndroidSDKCore')
 }
 
 task generateJavadoc(type: Javadoc) {
diff --git a/AndroidSDKTests/build.gradle b/AndroidSDKTests/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "../common-methods.gradle"
 apply plugin: 'com.facebook.testing.screenshot'
 
diff --git a/build.gradle b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'com.android.library'`
	`3`	`+ id 'kotlin-android'`
`3`	`4`	`id 'com.jfrog.artifactory' version '4.13.0'`
`4`	`5`	`id 'maven-publish'`
`5`	`6`	`id 'signing'`
`@@ -15,8 +16,7 @@ allprojects {`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`dependencies {`
`18`		`- debugApi project(':AndroidSDKCore')`
`19`		`- releaseApi project(':AndroidSDKCore')`
	`19`	`+ api project(':AndroidSDKCore')`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
	`2`	`+apply plugin: 'kotlin-android'`
`2`	`3`	`apply from: "../common-methods.gradle"`
`3`	`4`	`apply plugin: 'com.facebook.testing.screenshot'`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath 'com.android.tools.build:gradle:4.2.0'`
	`10`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32"`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`