Skip to content

Commit aa47df0

Browse files
authored
Merge pull request #8 from haroldadmin/kotlin-1.4
Update project to Kotlin 1.4
2 parents 712401c + 458eafd commit aa47df0

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
"compileSdk" : 29,
55
"minSdk" : 21,
66
"targetSdk" : 29,
7-
"kotlin" : "1.3.72",
8-
"agp" : "3.6.3",
7+
"kotlin" : "1.4.0",
8+
"agp" : "4.0.1",
99
"ktlintPlugin" : "9.1.1",
1010
"versionCode" : 1,
1111
"versionName" : "0.0.1"
@@ -26,7 +26,7 @@ buildscript {
2626
"espressoCore" : "3.2.0",
2727
"mockk" : "1.9.3",
2828
"robolectric" : "4.3.1",
29-
"startup" : "1.0.0-alpha01",
29+
"startup" : "1.0.0-alpha02",
3030
]
3131

3232
ext.libs = [

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-6.1-milestone-2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

what-the-stack/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ android {
3636
androidExtensions {
3737
experimental = true
3838
}
39+
40+
kotlin {
41+
explicitApi()
42+
}
3943
}
4044

4145
dependencies {

0 commit comments

Comments
 (0)