Skip to content

Commit 87f72ca

Browse files
committed
Add support for Android studio 4.1.3
Compiles and deploys an apk
1 parent c2a0fd4 commit 87f72ca

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-android-extensions'
34

45
android {
56
compileSdkVersion rootProject.ext.android.COMPILE_SDK_VERSION

app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.content.*
77
import android.content.pm.PackageManager
88
import android.content.res.Configuration
99
import android.os.Bundle
10+
import android.os.Handler
1011
import android.os.IBinder
1112
import android.preference.PreferenceManager
1213
import android.support.v4.app.ActivityCompat

build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ buildscript {
2121
return ""
2222
}
2323

24+
ext.kotlin_version = '1.3.50'
2425
ext.android = [
2526
ANDROID_SUPPORT_VERSION: '27.0.2',
2627

27-
KOTLIN_VERSION : '1.2.51',
28+
KOTLIN_VERSION : '1.3.50',
2829

2930
MIN_SDK_VERSION : 21,
3031

@@ -42,7 +43,7 @@ buildscript {
4243
"appcompat-v7" : "com.android.support:appcompat-v7:${ext.android.ANDROID_SUPPORT_VERSION}",
4344
"design" : "com.android.support:design:${ext.android.ANDROID_SUPPORT_VERSION}",
4445
"cardview-v7" : "com.android.support:cardview-v7:${ext.android.ANDROID_SUPPORT_VERSION}",
45-
"kotlin-stdlib" : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${ext.android.KOTLIN_VERSION}",
46+
"kotlin-stdlib" : "org.jetbrains.kotlin:kotlin-stdlib:${ext.android.KOTLIN_VERSION}",
4647
"kotlin-gradle-plugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:${ext.android.KOTLIN_VERSION}",
4748
"junit" : "junit:junit:${ext.android.JUNIT_VERSION}"
4849
]
@@ -54,7 +55,8 @@ buildscript {
5455
google()
5556
}
5657
dependencies {
57-
classpath 'com.android.tools.build:gradle:3.2.1'
58+
classpath 'com.android.tools.build:gradle:3.5.1'
59+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
5860
classpath rootProject.ext.deps["kotlin-gradle-plugin"]
5961

6062
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
@@ -71,6 +73,7 @@ allprojects {
7173
maven { url 'https://dl.google.com/dl/android/maven2/' }
7274
mavenCentral()
7375
maven { url "https://jitpack.io" }
76+
google()
7477
}
7578
}
7679

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 08 23:25:07 CST 2018
1+
#Tue Apr 20 22:03:06 EEST 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 commit comments

Comments
 (0)