Skip to content

Commit 56384db

Browse files
committed
Upgrade dependency versions (Android SDK, support library, espresso etc)
Updade to Android Oreo for compile and target SDK Switch to using built-in Android annotation processor
1 parent e286df6 commit 56384db

3 files changed

Lines changed: 18 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ Change Log
22
===============================================================================
33
Version 2.3.0 *(2017-09-xx)*
44
----------------------------
5+
* Fixed #709: Upgrade Dropbox SDK
56
* Improved #696: QIF files are now always zipped regardless of the export destination
7+
* Improved: Remove .zip extension from backup files and XML exports
8+
* Improved: Split handling and saving
69

710
Version 2.2.1 *(2017-09-01)*
811
----------------------------

app/build.gradle

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,31 @@ import java.text.SimpleDateFormat
22

33
apply plugin: 'com.android.application'
44
apply plugin: 'io.fabric'
5-
apply plugin: 'android-apt'
65

76
def versionMajor = 2
87
def versionMinor = 2
98
def versionPatch = 1
109
def versionBuild = 1
1110

12-
def buildTime() {
11+
static def buildTime() {
1312
def df = new SimpleDateFormat("yyyyMMdd HH:mm 'UTC'")
1413
df.setTimeZone(TimeZone.getTimeZone("UTC"))
1514
return df.format(new Date())
1615
}
1716

18-
def gitSha() {
17+
static def gitSha() {
1918
return 'git rev-parse --short HEAD'.execute().text.trim()
2019
}
2120

2221

2322
android {
24-
compileSdkVersion 24
25-
buildToolsVersion '25.0.0'
23+
compileSdkVersion 26
24+
buildToolsVersion '26.0.1'
2625
defaultConfig {
2726
applicationId "org.gnucash.android"
2827
testApplicationId 'org.gnucash.android.test'
2928
minSdkVersion 19
30-
targetSdkVersion 23
29+
targetSdkVersion 26
3130
versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
3231
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
3332
resValue "string", "app_version_name", "${versionName}"
@@ -192,9 +191,9 @@ android.productFlavors.all { flavour ->
192191
}
193192

194193

195-
def androidSupportVersion = "25.3.1"
196-
def androidEspressoVersion = "2.2.2"
197-
def androidSupportTestVersion = "0.5"
194+
def androidSupportVersion = "26.0.1"
195+
def androidEspressoVersion = "3.0.0"
196+
def androidSupportTestVersion = "1.0.0"
198197

199198
repositories{
200199
flatDir{
@@ -221,16 +220,16 @@ dependencies {
221220
'com.github.techfreak:wizardpager:1.0.3',
222221
'net.objecthunter:exp4j:0.4.7',
223222
'org.apache.jackrabbit:jackrabbit-webdav:2.13.3',
224-
'com.dropbox.core:dropbox-core-sdk:2.1.2',
223+
'com.dropbox.core:dropbox-core-sdk:3.0.3',
225224
'com.android.support:multidex:1.0.1'
226225
)
227226

228-
debugCompile 'com.facebook.stetho:stetho:1.4.2'
227+
debugCompile 'com.facebook.stetho:stetho:1.5.0'
229228

230-
compile 'com.jakewharton:butterknife:8.5.1'
231-
apt 'com.jakewharton:butterknife-compiler:8.5.1'
229+
compile 'com.jakewharton:butterknife:8.8.1'
230+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
232231

233-
compile ('com.uservoice:uservoice-android-sdk:1.2.5') {
232+
compile ('com.uservoice:uservoice-android-sdk:1.2.6') {
234233
exclude module: 'commons-logging'
235234
exclude module: 'httpcore'
236235
exclude module: 'httpclient'

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.1'
7+
classpath 'com.android.tools.build:gradle:2.3.3'
88
classpath 'io.fabric.tools:gradle:1.21.6'
9-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
109
classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.2'
1110
}
1211
}
@@ -18,6 +17,7 @@ allprojects {
1817
maven { url "https://jitpack.io" }
1918
maven { url "http://JRAF.org/static/maven/2" }
2019
jcenter()
20+
maven { url "https://maven.google.com"}
2121
mavenCentral()
2222
}
2323
}

0 commit comments

Comments
 (0)