Skip to content

Commit

Permalink
Update apk and build gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
@itchix
itchix committed Nov 10, 2016
1 parent ef6bde3 commit 88f1d19
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Binary file modified app/app-release.apk
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions app/build.gradle
View file
Expand Up @@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
apply plugin: 'android-apt'

android {
compileSdkVersion 24
buildToolsVersion "23.0.2"
compileSdkVersion 25
buildToolsVersion "23.0.3"

defaultConfig {
applicationId "openfoodfacts.github.scrachx.openfood"
minSdkVersion 16
targetSdkVersion 24
versionCode 25
versionName "0.2.7"
targetSdkVersion 25
versionCode 26
versionName "0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

Expand Down Expand Up @@ -63,13 +63,13 @@ apply plugin: 'com.neenbedankt.android-apt'

dependencies {

compile 'com.android.support:customtabs:24.0.0+'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:preference-v14:24.2.1'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:customtabs:25.0.0'
compile 'com.android.support:appcompat-v7:25.0.0'
compile 'com.android.support:preference-v14:25.0.0'
compile 'com.android.support:support-v4:25.0.0'
compile 'com.android.support:multidex:1.0.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:recyclerview-v7:25.0.0'
compile 'com.android.support:cardview-v7:25.0.0'

compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
Expand Down Expand Up @@ -122,7 +122,7 @@ dependencies {
testCompile 'net.javacrumbs.json-unit:json-unit-fluent:1.15.0'

// Required for instrumented tests
androidTestCompile 'com.android.support:support-annotations:24.2.1'
androidTestCompile 'com.android.support:support-annotations:25.0.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
Expand Down

3 comments on commit 88f1d19

@herau
Copy link
Contributor

@herau herau commented on 88f1d19 Nov 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@itchix still needed to have minSdkVersion in 16 ?

@itchix
Copy link
Contributor Author

@itchix itchix commented on 88f1d19 Nov 10, 2016 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@herau
Copy link
Contributor

@herau herau commented on 88f1d19 Nov 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@itchix

from the current build in travis (which failed)

[Android SDK Build-Tools 23.0.3, Android SDK Platform 25].
Before building your project, you need to accept the license agreements and complete the installation of the missing components using the Android Studio SDK Manager.
Alternatively, to learn how to transfer the license agreements from one workstation to another, go to http://d.android.com/r/studio-ui/export-licenses.html

https://travis-ci.org/openfoodfacts/OpenFoodFacts-androidApp

Please sign in to comment.