Skip to content

Commit

Permalink
feat: merge develop (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
MykhailoNester authored May 7, 2021
1 parent 9631b7a commit 353b5fb
Show file tree
Hide file tree
Showing 46 changed files with 2,460 additions and 0 deletions.
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
*.iml
.gradle
/local.properties
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties

.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/sonarlint/
.idea/sonarIssues.xml
.idea/codeStyles/

# User-specific configurations
.idea/caches/
.idea/shelf/
.idea/.name
.idea/compiler.xml
.idea/encodings.xml
.idea/misc.xml
.idea/vcs.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/kotlinScripting.xml
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {

repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath Deps.tools_gradle_android
classpath Deps.tools_kotlin
classpath Deps.androidx_navigation
classpath Deps.hilt_plugin

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
google()
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
2 changes: 2 additions & 0 deletions buildSrc/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.gradle/
build/
7 changes: 7 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repositories {
jcenter()
}

plugins {
`kotlin-dsl`
}
36 changes: 36 additions & 0 deletions buildSrc/src/main/java/AppConfig.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* ---license-start
* eu-digital-green-certificates / dgca-verifier-app-android
* ---
* Copyright (C) 2021 T-Systems International GmbH and all other contributors
* ---
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ---license-end
*
* Created by Mykhailo Nester on 4/23/21 9:49 AM
*/

import org.gradle.api.JavaVersion

object Config {
const val minSdk = 26
const val compileSdk = 29
const val targetSdk = 29
val javaVersion = JavaVersion.VERSION_1_8

const val versionCode = 1
const val versionName = "1.0.0"

const val androidTestInstrumentation = "androidx.test.runner.AndroidJUnitRunner"
const val proguardConsumerRules = "consumer-rules.pro"
}
55 changes: 55 additions & 0 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* ---license-start
* eu-digital-green-certificates / dgca-verifier-app-android
* ---
* Copyright (C) 2021 T-Systems International GmbH and all other contributors
* ---
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ---license-end
*
* Created by Mykhailo Nester on 4/23/21 9:49 AM
*/

object Deps {

const val tools_gradle_android = "com.android.tools.build:gradle:${Versions.gradle}"
const val tools_kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
const val kotlinx_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinx_coroutines}"
const val androidx_core = "androidx.core:core-ktx:${Versions.androidx_core}"
const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.androidx_appcompat}"
const val androidx_material = "com.google.android.material:material:${Versions.androidx_material}"
const val androidx_constraint = "androidx.constraintlayout:constraintlayout:${Versions.androidx_constraint}"
const val androidx_navigation_fragment = "androidx.navigation:navigation-fragment-ktx:${Versions.androidx_navigation}"
const val androidx_navigation_ui = "androidx.navigation:navigation-ui-ktx:${Versions.androidx_navigation}"
const val androidx_navigation = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"
const val androidx_hilt_compiler = "androidx.hilt:hilt-compiler:${Versions.androidx_hilt_compiler}"
const val androidx_room_runtime = "androidx.room:room-runtime:${Versions.androidx_room}"
const val androidx_room_compiler = "androidx.room:room-compiler:${Versions.androidx_room}"
const val retrofit2 = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
const val log_interceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.logging_interceptor}"
const val gson_converter = "com.squareup.retrofit2:converter-gson:${Versions.gson_converter}"

const val hilt_plugin = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt_version}"
const val hilt = "com.google.dagger:hilt-android:${Versions.hilt_version}"
const val hilt_compiler = "com.google.dagger:hilt-android-compiler:${Versions.hilt_version}"
const val hilt_viewmodel = "androidx.hilt:hilt-lifecycle-viewmodel:${Versions.androidx_hilt_viewmodel}"

const val zxing = "com.journeyapps:zxing-android-embedded:${Versions.zxing}"
const val kotlin_reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin_reflect}"
const val java_cose = "com.augustcellars.cose:cose-java:${Versions.java_cose}"
const val json_validation = "com.github.fge:json-schema-validator:${Versions.json_validation}"
const val jackson_cbor = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${Versions.jackson_cbor}"

const val test_junit = "junit:junit:${Versions.junit}"
}
55 changes: 55 additions & 0 deletions buildSrc/src/main/java/Versions.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* ---license-start
* eu-digital-green-certificates / dgca-verifier-app-android
* ---
* Copyright (C) 2021 T-Systems International GmbH and all other contributors
* ---
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ---license-end
*
* Created by Mykhailo Nester on 4/23/21 9:49 AM
*/

object Versions {

// Base
const val gradle = "4.1.3"
const val kotlin = "1.4.32"
const val androidx_core = "1.3.2"
const val androidx_appcompat = "1.2.0"
const val androidx_navigation = "2.3.5"
const val androidx_material = "1.3.0"
const val androidx_constraint = "2.0.4"
const val kotlinx_coroutines = "1.3.9"
const val androidx_hilt_viewmodel = "1.0.0-alpha01"
const val androidx_hilt_compiler = "1.0.0-alpha01"
const val androidx_room = "2.3.0"
const val hilt_version = "2.33-beta"
const val retrofit = "2.9.0"
const val logging_interceptor = "4.0.1"
const val gson_converter = "2.6.0"

// QR
const val zxing = "4.2.0"

// Decoder
const val kotlin_reflect = "1.4.32"
const val jackson_cbor = "2.12.3"
const val java_cose = "1.1.0"

// Validation
const val json_validation = "2.2.6"

// Tests
const val junit = "4.13.1"
}
Loading

0 comments on commit 353b5fb

Please sign in to comment.