Permalink
Browse files

rename release -> firebase and incognito -> release (for fdroid)

  • Loading branch information...
kar committed Aug 23, 2017
1 parent a297dec commit 7ff364e1c33dbf8d8222797dbdb4a52fab9b0bb0
View
@@ -16,10 +16,9 @@ android {
main.java.srcDirs += 'src/main/kotlin'
dev.java.srcDirs += 'src/dev/kotlin'
prod.java.srcDirs += 'src/prod/kotlin'
release.java.srcDirs += 'src/release/kotlin'
release.java.srcDirs += 'src/firebase/kotlin'
firebase.java.srcDirs += 'src/firebase/kotlin'
debug.java.srcDirs += 'src/debug/kotlin'
incognito.java.srcDirs += 'src/incognito/kotlin'
release.java.srcDirs += 'src/release/kotlin'
}
signingConfigs {
release {
@@ -30,12 +29,12 @@ android {
}
}
buildTypes {
release {
firebase {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
incognito {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
@@ -59,12 +58,12 @@ android {
dependencies {
// The UI Blokada library
debugCompile project(path: ':libui', configuration: 'debug')
incognitoCompile project(path: ':libui', configuration: 'release')
firebaseCompile project(path: ':libui', configuration: 'release')
releaseCompile project(path: ':libui', configuration: 'release')
// Analytics and debugging
releaseCompile 'com.google.firebase:firebase-core:10.2.4'
releaseCompile 'com.google.firebase:firebase-crash:10.2.4'
firebaseCompile 'com.google.firebase:firebase-core:10.2.4'
firebaseCompile 'com.google.firebase:firebase-crash:10.2.4'
// Test dependencies
testCompile 'junit:junit:4.12'
@@ -19,6 +19,6 @@ class MainApplication: Application(), KodeinAware {
import(newAppUiModule())
import(newAndroidAppUiModule(this@MainApplication))
import(newAndroidAppConfigModule(this@MainApplication), allowOverride = true)
import(newFirebaseModule(), allowOverride = true)
}
}
@@ -19,6 +19,6 @@ class MainApplication: Application(), KodeinAware {
import(newAppUiModule())
import(newAndroidAppUiModule(this@MainApplication))
import(newAndroidAppConfigModule(this@MainApplication), allowOverride = true)
import(newFirebaseModule(), allowOverride = true)
}
}
View
@@ -39,8 +39,8 @@ function release {
export VARIANT=Release
}
function incognito {
export VARIANT=Incognito
function firebase {
export VARIANT=Firebase
}
function run {
@@ -56,7 +56,7 @@ function run {
dev
make ${*:3}
else
>&2 echo "Unknown flavor: $1. Usage: ./makef flavor (d|r|i) targets to execute"
>&2 echo "Unknown flavor: $1. Usage: ./makef flavor (d|r|f) targets to execute"
exit 1
fi
}
@@ -67,17 +67,17 @@ if [ "$2" = "d" ]; then
elif [ "$2" = "r" ]; then
release
run $@
elif [ "$2" = "i" ]; then
incognito
elif [ "$2" = "f" ]; then
firebase
run $@
elif [ "$2" = "all" ]; then
debug
run $@
release
run $@
incognito
firebase
run $@
else
>&2 echo "Unknown variant: $2. Usage: ./makef flavor (d|r|i) targets to execute"
>&2 echo "Unknown variant: $2. Usage: ./makef flavor (d|r|f) targets to execute"
exit 1
fi

0 comments on commit 7ff364e

Please sign in to comment.