Skip to content

Commit 0ec3a54

Browse files
misteryrivaldi8
authored andcommitted
Android Studio 3 compatibility (#742)
Android Studio 3 compatibility
1 parent 79aa2fc commit 0ec3a54

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static def gitSha() {
2121

2222
android {
2323
compileSdkVersion 26
24-
buildToolsVersion '26.0.1'
24+
buildToolsVersion '27.0.0'
2525
defaultConfig {
2626
applicationId "org.gnucash.android"
2727
testApplicationId 'org.gnucash.android.test'
@@ -49,9 +49,8 @@ android {
4949
}
5050

5151
applicationVariants.all { variant ->
52-
variant.outputs.each { output ->
53-
output.outputFile = new File(
54-
output.outputFile.parent, "GnucashAndroid_v${variant.versionName}.apk")
52+
variant.outputs.all { output ->
53+
outputFileName = "GnucashAndroid_v${variant.versionName}.apk"
5554
}
5655
}
5756

@@ -93,6 +92,8 @@ android {
9392
abortOnError false
9493
}
9594

95+
flavorDimensions "stability"
96+
9697
productFlavors {
9798
development {
9899
applicationId 'org.gnucash.android.devel'
@@ -136,7 +137,6 @@ android {
136137
resValue "string", "manifest_dropbox_app_key", "db-dhjh8ke9wf05948"
137138
}
138139
}
139-
140140
}
141141

142142

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<style name="ListItemContainerBase">
2020
<item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
2121
</style>
22-
<style name="ListItem" parent="style/ListItemContainerBase">
22+
<style name="ListItem" parent="ListItemContainerBase">
2323
<item name="android:paddingLeft">@dimen/dialog_padding</item>
2424
<item name="android:paddingRight">@dimen/dialog_padding</item>
2525
<item name="android:paddingTop">8dp</item>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.3'
7+
classpath 'com.android.tools.build:gradle:3.0.0'
88
classpath 'io.fabric.tools:gradle:1.21.6'
99
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
1010
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 04 18:07:15 CEST 2017
1+
#Mon Oct 30 21:17:22 CET 2017
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-3.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)