Skip to content

update build tools, gradle, compile/target sdk, spongycastle #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 13, 2017
Merged

update build tools, gradle, compile/target sdk, spongycastle #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f23c93
update gradle
brianPlummer Jan 13, 2017
d5eccef
update build tools
brianPlummer Jan 13, 2017
cc8a557
update compile, target sdk, and support lib
brianPlummer Jan 13, 2017
76020a6
update spongycastle
brianPlummer Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ buildscript {
}
dependencies {

classpath 'com.android.tools.build:gradle:1.2.2'
classpath 'com.android.tools.build:gradle:2.2.3'

}
}

apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 25
buildToolsVersion "25.0.1"

defaultConfig {
minSdkVersion 14
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.0"
}
Expand All @@ -32,10 +32,10 @@ android {

dependencies {

compile 'com.android.support:appcompat-v7:23.+'
compile 'com.android.support:appcompat-v7:25.0.1'
compile 'org.ow2.util.base64:base64:2.0.0'
compile 'com.madgag.spongycastle:prov:1.51.0.0'
compile 'com.android.support:support-annotations:23.0.2'
compile 'com.madgag.spongycastle:prov:1.54.0.0'
compile 'com.android.support:support-annotations:25.1.0'
testCompile 'junit:junit:4.12'
testCompile 'org.apache.commons:commons-io:1.3.2'
testCompile 'bouncycastle:bouncycastle-jce-jdk13:112'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Dec 28 21:16:45 EST 2014
#Thu Jan 12 22:00:50 EST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip