Browse Source

add kotlin support

main
Distopico Vegan 5 years ago
parent
commit
585a0f3bee
No known key found for this signature in database GPG Key ID: 98093A8072546BF3
3 changed files with 13 additions and 6 deletions
  1. +6
    -1
      app/build.gradle
  2. +5
    -3
      build.gradle
  3. +2
    -2
      gradle/wrapper/gradle-wrapper.properties

+ 6
- 1
app/build.gradle View File

@ -1,4 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: "com.android.application"
apply plugin: "kotlin-android-extensions"
apply plugin: "kotlin-android"
apply from: "${rootDir}/jdee.gradle" apply from: "${rootDir}/jdee.gradle"
android { android {
@ -121,4 +123,7 @@ dependencies {
// https://android.googlesource.com/platform/frameworks/opt/colorpicker // https://android.googlesource.com/platform/frameworks/opt/colorpicker
implementation project(path: ':colorpicker', configuration: 'default') implementation project(path: ':colorpicker', configuration: 'default')
// Kotlin support
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
} }

+ 5
- 3
build.gradle View File

@ -1,12 +1,14 @@
apply plugin: 'checkstyle'
apply plugin: "checkstyle"
buildscript { buildscript {
ext.kotlin_version = "1.3.31"
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "com.android.tools.build:gradle:3.4.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@ -18,7 +20,7 @@ allprojects {
} }
checkstyle { checkstyle {
toolVersion '8.13'
toolVersion "8.13"
} }
ext { ext {


+ 2
- 2
gradle/wrapper/gradle-wrapper.properties View File

@ -1,6 +1,6 @@
#Wed Sep 26 11:20:02 UTC 2018
#Sat May 18 11:05:12 COT 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

Loading…
Cancel
Save