Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/pairing exercises #75

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged

end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true


# Use 2 spaces for indentation in HTML, JavaScript, Ruby, SCSS, and XML
[*.{html,js,ts,rb,scss,xml, kt, jv, java}]
indent_size = 2

[Gemfile*]
indent_size = 2

[Rakefile]
indent_size = 2

[Makefile]
indent_style = tab
indent_size = 2

# Use 4 spaces for indentation in c source files
[*.c]
indent_size = 4

# Use 4 spaces for indentation in Markdown files
[*.md]
indent_size = 4
trim_trailing_whitespace = false

[gnome-terminal/**.xml]
indent_style = tab
indent_size = 4
193 changes: 93 additions & 100 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,118 +5,111 @@ apply plugin: 'realm-android'
apply plugin: 'io.fabric'

android {
defaultConfig {
vectorDrawables.useSupportLibrary = true
defaultConfig {
vectorDrawables.useSupportLibrary = true
}
flavorDimensions "default"
configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
}
dexOptions {
maxProcessCount 4
}
compileSdkVersion 26
defaultConfig {
applicationId 'com.bodyweight.fitness'
minSdkVersion 21
targetSdkVersion 26
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES.txt'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/notice.txt'
exclude 'META-INF/license.txt'
exclude 'META-INF/dependencies.txt'
exclude 'META-INF/LGPL2.1'
exclude 'META-INF/services/javax.annotation.processing.Processor'
}
productFlavors {
pro {
resValue "string", "file_provider", "com.bodyweight.fitness.pro.fileprovider"
applicationId 'com.bodyweight.fitness.pro'
versionCode 142
versionName "1.4.2"
}
flavorDimensions "default"
configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
free {
resValue "string", "file_provider", "com.bodyweight.fitness.free.fileprovider"
applicationId 'com.bodyweight.fitness.free'
versionCode 142
versionName "1.4.2"
}
dexOptions {
maxProcessCount 4
}
buildTypes {
release {
minifyEnabled false
}
compileSdkVersion 26
defaultConfig {
applicationId 'com.bodyweight.fitness'
minSdkVersion 21
targetSdkVersion 26
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
debug {
minifyEnabled false
ext.enableCrashlytics = false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES.txt'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/notice.txt'
exclude 'META-INF/license.txt'
exclude 'META-INF/dependencies.txt'
exclude 'META-INF/LGPL2.1'
exclude 'META-INF/services/javax.annotation.processing.Processor'
}
productFlavors {
pro {
resValue "string", "file_provider", "com.bodyweight.fitness.pro.fileprovider"
applicationId 'com.bodyweight.fitness.pro'
versionCode 142
versionName "1.4.2"
}
free {
resValue "string", "file_provider", "com.bodyweight.fitness.free.fileprovider"
applicationId 'com.bodyweight.fitness.free'
versionCode 142
versionName "1.4.2"
}
}
buildTypes {
release {
minifyEnabled false
}
debug {
minifyEnabled false
ext.enableCrashlytics = false
}
}
sourceSets {
main.java.srcDirs += 'src/main/java'
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'

customDebugType {
debuggable true
}
}
sourceSets {
main.java.srcDirs += 'src/main/java'
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDirs += 'src/test/kotlin'
}
}

kapt {
generateStubs = true
generateStubs = true
}

configurations {
all*.exclude group: 'io.reactivex', module: 'rxjava'
all*.exclude group: 'io.reactivex', module: 'rxjava'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

testImplementation 'org.jetbrains.spek:spek:1.0.9'
testImplementation 'org.mockito:mockito-all:2.0.2-beta'

androidTestImplementation "com.android.support:support-annotations:$support_version"
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support.test:rules:0.5'
androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2"

implementation "com.android.support:support-v4:$support_version"
implementation "com.android.support:recyclerview-v7:$support_version"
implementation "com.android.support:cardview-v7:$support_version"
implementation "com.android.support:design:$support_version"

implementation 'com.google.code.gson:gson:2.4'

implementation 'commons-io:commons-io:2.4'
implementation 'net.danlew:android.joda:2.9.3'

implementation 'com.netflix.rxjava:rxjava-core:0.20.7'
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.2.1'

implementation 'com.trello:rxlifecycle:0.8.0'
implementation 'com.trello:rxlifecycle-components:0.8.0'
implementation 'com.trello:rxlifecycle-kotlin:0.8.0'

implementation 'com.robinhood.spark:spark:1.2.0'

implementation 'com.roughike:bottom-bar:2.0.2'
implementation 'com.github.johnkil.android-robototextview:robototextview:4.0.0'
implementation 'com.gordonwong:material-sheet-fab:1.2.1'
implementation 'io.github.kobakei:ratethisapp:1.0.3'
implementation 'com.github.paolorotolo:appintro:4.1.0'

implementation('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
transitive = true
}
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
testImplementation 'org.jetbrains.spek:spek:1.0.9'
testImplementation 'org.mockito:mockito-all:2.0.2-beta'
androidTestImplementation "com.android.support:support-annotations:$support_version"
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support.test:rules:0.5'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
implementation "com.android.support:support-v4:$support_version"
implementation "com.android.support:recyclerview-v7:$support_version"
implementation "com.android.support:cardview-v7:$support_version"
implementation "com.android.support:design:$support_version"
implementation 'com.google.code.gson:gson:2.4'
implementation 'commons-io:commons-io:2.4'
implementation 'net.danlew:android.joda:2.9.3'
implementation 'com.netflix.rxjava:rxjava-core:0.20.7'
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.2.1'
implementation 'com.trello:rxlifecycle:0.8.0'
implementation 'com.trello:rxlifecycle-components:0.8.0'
implementation 'com.trello:rxlifecycle-kotlin:0.8.0'
implementation 'com.robinhood.spark:spark:1.2.0'
implementation 'com.roughike:bottom-bar:2.0.2'
implementation 'com.github.johnkil.android-robototextview:robototextview:4.0.0'
implementation 'com.gordonwong:material-sheet-fab:1.2.1'
implementation 'io.github.kobakei:ratethisapp:1.0.3'
implementation 'com.github.paolorotolo:appintro:4.1.0'
implementation('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
transitive = true
}
}
Loading