From f8bcbeb9b70e8ab8823a941ed59b1ceaca3b8172 Mon Sep 17 00:00:00 2001 From: jacques Date: Sun, 12 Apr 2020 17:57:10 +0000 Subject: [PATCH] Realign --- app/build.gradle | 6 +++--- app/src/main/java/net/foucry/pilldroid/DBHelper.java | 2 +- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aa4b7ee..e971d73 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,13 +19,13 @@ android { productFlavors { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } /*dexOptions { incremental false }*/ - buildToolsVersion = '29.0.2' + buildToolsVersion = buildToolsVersion1 } repositories { @@ -37,7 +37,7 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:design:27.1.1' diff --git a/app/src/main/java/net/foucry/pilldroid/DBHelper.java b/app/src/main/java/net/foucry/pilldroid/DBHelper.java index ca450e7..a8a93fc 100644 --- a/app/src/main/java/net/foucry/pilldroid/DBHelper.java +++ b/app/src/main/java/net/foucry/pilldroid/DBHelper.java @@ -20,7 +20,7 @@ class DBHelper extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 1; private static String DATABASE_NAME = "ordonnance.db"; - private static final String TABLE_DRUG = "drug"; + private static final String TABLE_DRUG = "drug"; private static final String KEY_ID = "id"; private static final String KEY_CIS = "cis"; private static final String KEY_CIP13 = "cip13"; diff --git a/build.gradle b/build.gradle index 4fdbf45..47e20d3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.6.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,6 +19,7 @@ ext { compileSdkVersion = '27' buildToolsVersion = '27.0.1' var = '3.4.2' + buildToolsVersion1 = '29.0.3' } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd89f37..8c344a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 11 18:46:50 CEST 2019 +#Sun Apr 12 14:00:20 UTC 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip