Commit 7c4d51b3 authored by Roger Barton's avatar Roger Barton
Browse files

Update gradle & build tool version for gradle 4.6

parent 44c02427
Pipeline #8725 passed with stages
in 3 minutes and 58 seconds
......@@ -9,8 +9,8 @@ before_script:
- sed -i 's/\s\+/\n/g' app/keystore.properties
# Note: Gitlab CI variables show newlines as a space, this will render the storePath as incorrect->Throws error that signingConfig was not found
- sdkmanager "platforms;android-27"
- sdkmanager "build-tools;27.0.3"
- sdkmanager "platforms;android-28"
- sdkmanager "build-tools;28.0.3"
- export GRADLE_USER_HOME=`pwd`/.gradle
- chmod +x ./gradlew
- npm install
......
......@@ -7,8 +7,8 @@ def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'
playAccountConfigs {
defaultAccountConfig {
......@@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId "ch.amiv.android_app"
minSdkVersion 23
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
......@@ -50,15 +50,15 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
//implementation 'com.mcxiaoke.volley:library:1.0.19'
implementation project(path: ':volley')
implementation 'com.google.zxing:core:3.2.1'
implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
implementation 'com.google.android.gms:play-services-vision:15.0.2'
implementation 'com.google.android.gms:play-services-vision:17.0.2'
implementation 'com.google.code.gson:gson:2.8.2'
testImplementation 'junit:junit:4.12'
......
......@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
// NOTE: Do not place your application dependencies here; they belong
......
#Fri May 25 19:05:02 CEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
#Wed Oct 17 21:47:57 GMT+02:00 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
Subproject commit 2ac23ae09470d435373a1d4fe6c621e22bfcf8f3
Subproject commit 9972d943da14c57d6e258c42e4faac3a061c0330
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment