From 3e3daf6c0cc579782b371f91551c18f11b8ec747 Mon Sep 17 00:00:00 2001 From: Ilshat Safiullin Date: Thu, 4 Oct 2018 22:01:08 +0500 Subject: [PATCH] added kotlin plugin for successfull compilation --- proj.android-studio/app/build.gradle | 3 +++ proj.android-studio/build.gradle | 2 ++ 2 files changed, 5 insertions(+) diff --git a/proj.android-studio/app/build.gradle b/proj.android-studio/app/build.gradle index c1a8d40..2df2738 100755 --- a/proj.android-studio/app/build.gradle +++ b/proj.android-studio/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' android { compileSdkVersion 28 @@ -45,4 +46,6 @@ dependencies { implementation 'com.android.support:appcompat-v7:28+' implementation project(':SalmonEngineAndroid') + + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/proj.android-studio/build.gradle b/proj.android-studio/build.gradle index 9032a28..f8360c7 100755 --- a/proj.android-studio/build.gradle +++ b/proj.android-studio/build.gradle @@ -1,6 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.2.70' repositories { jcenter() google() @@ -8,6 +9,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.0-alpha18' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files