Skip to content

Commit

Permalink
Merge pull request #34 from mobileappdevhm20/develop
Browse files Browse the repository at this point in the history
First app release
  • Loading branch information
WagnerThomas authored Jun 5, 2020
2 parents a087fd7 + 116dcaf commit 695276b
Show file tree
Hide file tree
Showing 107 changed files with 2,555 additions and 237 deletions.
17 changes: 4 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
.gradle/
.idea/
build/
local.properties
122 changes: 0 additions & 122 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/gradle.xml

This file was deleted.

28 changes: 0 additions & 28 deletions .idea/misc.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

55 changes: 55 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# General
language: android
jdk: oraclejdk8
dist: xenial
os: linux

# Environment variables
env:
global:
- ANDROID_API_LEVEL=29
- ANDROID_BUILD_TOOLS_VERSION=29.0.3

# Android
android:
components:
- tools
- platform-tools
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
- android-$ANDROID_API_LEVEL
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-$ANDROID_API_LEVEL
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

# Caching
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache

# Make gradle executable
before_script:
- chmod +x gradlew

# Stages
stages:
- compile
- test

# Jobs
jobs:
include:
- stage: compile
script: ./gradlew assembleDebug
- stage: test
script: ./gradlew test
- script: ./gradlew ktlintReleaseFormat
47 changes: 43 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'org.jlleitschuh.gradle.ktlint'
apply plugin: 'androidx.navigation.safeargs'

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "com.example.easybill"
minSdkVersion 28
applicationId "com.easybill"
minSdkVersion 29
targetSdkVersion 29
versionCode 1
versionName "1.0"
Expand All @@ -23,15 +26,51 @@ android {
}
}

dataBinding {
enabled = true
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.2.0'
implementation 'androidx.core:core-ktx:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'com.google.android.material:material:1.1.0'

// Room
def room_version = "2.2.5"
implementation "androidx.room:room-runtime:$room_version"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
kapt "androidx.room:room-compiler:$room_version"

// ViewModel
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

// Coroutines
def coroutine_version = '1.1.0'
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version"

// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "android.arch.navigation:navigation-ui-ktx:$navigationVersion"
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'

// Timber
implementation 'com.jakewharton.timber:timber:4.7.1'

// Recyclerview
implementation "androidx.recyclerview:recyclerview:1.1.0"
}

ktlint {
android.set(true)
outputColorName.set("RED")
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.easybill
package com.easybill

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
Loading

0 comments on commit 695276b

Please sign in to comment.