mathieu/Generator-Attestation-Covid-19
1
0
Fork 0
Code Issues 3 Pull Requests Releases 15 Activity

Compare commits

merge into: mathieu:ms/issue-19/new_curfew_attestation
Branches Tags
mathieu:master
mathieu:beta
mathieu:ms/issue-19/new_curfew_attestation
mathieu:ms/issue-18/change_new_attestation
mathieu:ms/issues-17/add_buy_me_a_coffee
mathieu:ms/issue-16/update_new_attestation
mathieu:ms/issue-5/add-profils
mathieu:ms/issue-14/adding-pickers
mathieu:ms/issue-4/add-credits-libraries-used
mathieu:alpha
mathieu:2.1.2-beta1
mathieu:2.1.1-beta1
mathieu:2.1.0
mathieu:2.0.2-beta1
mathieu:2.0.1
mathieu:2.0.1-beta2
mathieu:2.0.1-beta1
mathieu:1.0.5-beta1
mathieu:1.0.5
mathieu:1.0.4-beta2
mathieu:1.040-beta1
mathieu:1.0.4
mathieu:1.0.3
mathieu:1.0.1
mathieu:1.0
...
pull from: mathieu:master
Branches Tags
mathieu:beta
mathieu:master
mathieu:ms/issue-19/new_curfew_attestation
mathieu:ms/issue-18/change_new_attestation
mathieu:ms/issues-17/add_buy_me_a_coffee
mathieu:ms/issue-16/update_new_attestation
mathieu:ms/issue-5/add-profils
mathieu:ms/issue-14/adding-pickers
mathieu:ms/issue-4/add-credits-libraries-used
mathieu:alpha
mathieu:2.1.2-beta1
mathieu:2.1.1-beta1
mathieu:2.1.0
mathieu:2.0.2-beta1
mathieu:2.0.1
mathieu:2.0.1-beta2
mathieu:2.0.1-beta1
mathieu:1.0.5-beta1
mathieu:1.0.5
mathieu:1.0.4-beta2
mathieu:1.040-beta1
mathieu:1.0.4
mathieu:1.0.3
mathieu:1.0.1
mathieu:1.0

5 Commits
ms/issue-1 ... master

Author SHA1 Message Date
Mathieu Sanchez
97c1712181 Version 2.2.0 versionCode 13 2020-12-15 18:45:34 +01:00
Mathieu Sanchez
9febdc9c35 Merge branch 'ms/issue-19/new_curfew_attestation' 
# Conflicts:
#	app/build.gradle
 2020-12-15 18:26:22 +01:00
Mathieu Sanchez
4ba6e0ea58 Version 2.1.1 versionCode 12 2020-11-28 10:38:34 +01:00
Mathieu Sanchez
65c7d46379 Merge branch 'ms/issue-18/change_new_attestation' 2020-11-28 10:35:43 +01:00
Mathieu Sanchez
92d703ec7b Version 2.1.0 versionCode 11 2020-11-28 03:51:20 +01:00
2 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
app/build.gradle
View File

@ -8,15 +8,15 @@ android {
buildToolsVersion "29.0.3" buildToolsVersion "29.0.3"
buildFeatures { buildFeatures {
dataBinding = true dataBinding true
} }
defaultConfig { defaultConfig {
applicationId "fr.sanchezm.attestationsCovid19" applicationId "fr.sanchezm.attestationsCovid19"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 1008 versionCode 13
versionName "2.1.2-beta1" versionName "2.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -81,8 +81,8 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.1' implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
// Design // Design
implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.android.material:material:1.2.1'

4
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.4.10' kotlin_version = '1.4.21'
db_version = '1' db_version = '1'
} }
@ -13,7 +13,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:4.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong