Skip to content
Snippets Groups Projects
Commit 39a92e72 authored by Lennart Goedhart's avatar Lennart Goedhart
Browse files

- Fixed Gradle Task.leftShift(Closure) deprecation warning

- Update Fabric to latest
parent f6c78cf5
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ buildscript { ...@@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'io.fabric.tools:gradle:1.21.6' classpath 'io.fabric.tools:gradle:1.22.2'
classpath 'io.realm:realm-gradle-plugin:3.4.0' classpath 'io.realm:realm-gradle-plugin:3.4.0'
classpath 'org.ajoberstar:grgit:1.5.0' classpath 'org.ajoberstar:grgit:1.5.0'
} }
...@@ -88,52 +88,56 @@ android { ...@@ -88,52 +88,56 @@ android {
} }
} }
task signRelease << { task signRelease {
def command = [ doLast {
'jarsigner', def command = [
'-verbose', 'jarsigner',
'-sigalg', '-verbose',
'SHA1withRSA', '-sigalg',
'-digestalg', 'SHA1withRSA',
'SHA1', '-digestalg',
'-keystore', 'SHA1',
'/Users/lennart/keystores/nightscout_android.jks', '-keystore',
'app/build/outputs/apk/app-release-unsigned.apk', '/Users/lennart/keystores/nightscout_android.jks',
'nightscoutandroidkey' 'app/build/outputs/apk/app-release-unsigned.apk',
] 'nightscoutandroidkey'
]
def proc = new ProcessBuilder(command)
.redirectOutput(ProcessBuilder.Redirect.INHERIT) def proc = new ProcessBuilder(command)
.redirectInput(ProcessBuilder.Redirect.INHERIT) .redirectOutput(ProcessBuilder.Redirect.INHERIT)
.redirectError(ProcessBuilder.Redirect.INHERIT) .redirectInput(ProcessBuilder.Redirect.INHERIT)
.start() .redirectError(ProcessBuilder.Redirect.INHERIT)
.start()
proc.waitFor()
proc.waitFor()
if (0 != proc.exitValue()) {
throw new RuntimeException("Could not sign APK.") if (0 != proc.exitValue()) {
throw new RuntimeException("Could not sign APK.")
}
} }
} }
task zipalignRelease << { task zipalignRelease {
def command = [ doLast {
'/Users/lennart/Library/Android/sdk/build-tools/25.0.2/zipalign', def command = [
'-v', '/Users/lennart/Library/Android/sdk/build-tools/25.0.2/zipalign',
'4', '-v',
'app/build/outputs/apk/app-release-unsigned.apk', '4',
'app/build/outputs/apk/600-series-uploader.apk' 'app/build/outputs/apk/app-release-unsigned.apk',
] 'app/build/outputs/apk/600-series-uploader.apk'
]
def proc = new ProcessBuilder(command)
.redirectOutput(ProcessBuilder.Redirect.INHERIT) def proc = new ProcessBuilder(command)
.redirectInput(ProcessBuilder.Redirect.INHERIT) .redirectOutput(ProcessBuilder.Redirect.INHERIT)
.redirectError(ProcessBuilder.Redirect.INHERIT) .redirectInput(ProcessBuilder.Redirect.INHERIT)
.start() .redirectError(ProcessBuilder.Redirect.INHERIT)
.start()
proc.waitFor()
proc.waitFor()
if (0 != proc.exitValue()) {
throw new RuntimeException("Could not align APK.") if (0 != proc.exitValue()) {
throw new RuntimeException("Could not align APK.")
}
} }
} }
...@@ -161,6 +165,10 @@ dependencies { ...@@ -161,6 +165,10 @@ dependencies {
compile 'com.squareup.retrofit2:retrofit:2.1.0' compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile 'com.squareup.retrofit2:converter-gson:2.1.0' compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true;
}
// The version of okhttp3 *must* be the same as the version in AppUpdater // The version of okhttp3 *must* be the same as the version in AppUpdater
compile 'com.squareup.okhttp3:okhttp:3.6.0' compile 'com.squareup.okhttp3:okhttp:3.6.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.6.0' compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment