aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-25 21:11:15 -0700
committerAllan Wang <me@allanwang.ca>2017-06-25 21:11:15 -0700
commitb6530cc36d049a292fe52ea21893c5362155a3b7 (patch)
treeb60521096e9c903c8086d4d4c51cd3ae01839f95
parentf35939ce42ca9244468434f93dbd705e02911623 (diff)
downloadfrost-b6530cc36d049a292fe52ea21893c5362155a3b7.tar.gz
frost-b6530cc36d049a292fe52ea21893c5362155a3b7.tar.bz2
frost-b6530cc36d049a292fe52ea21893c5362155a3b7.zip
Hold kau
-rw-r--r--.idea/misc.xml2
-rw-r--r--app/build.gradle22
-rw-r--r--build.gradle10
-rw-r--r--gradle.properties12
4 files changed, 31 insertions, 15 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7319f021..085136f8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -53,7 +53,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index f2a6a7c6..5bc879ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,6 +70,14 @@ android {
}
}
+repositories {
+ jcenter()
+ mavenCentral()
+ maven { url "https://jitpack.io" }
+ maven { url 'https://maven.google.com' }
+ maven { url 'https://maven.fabric.io/public' }
+}
+
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -77,7 +85,7 @@ dependencies {
})
testCompile 'junit:junit:4.12'
- compile "ca.allanwang:kau:${KAU}"
+ compile("ca.allanwang:kau:${KAU}")
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
@@ -92,15 +100,23 @@ dependencies {
annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
-// compile "com.github.Raizlabs.DBFlow:dbflow-rx2:${DBFLOW}"
-// compile "com.github.Raizlabs.DBFlow:dbflow-rx2-kotlinextensions:${DBFLOW}"
+
+// compile "org.greenrobot:eventbus:${EVENTBUS}"
//Icons
+ compile "com.mikepenz:google-material-typeface:${IICON_GOOGLE}.original@aar"
compile "com.mikepenz:material-design-iconic-typeface:${IICON_MATERIAL}@aar"
compile "com.mikepenz:community-material-typeface:${IICON_COMMUNITY}@aar"
+ compile "io.reactivex.rxjava2:rxjava:${RX_JAVA}"
+ compile "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}"
+// compile "com.jakewharton.rxbinding2:rxbinding:${RX_BINDING}"
+// compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${RX_BINDING}"
+
compile "org.jsoup:jsoup:${JSOUP}"
+ compile "org.jetbrains.anko:anko:${ANKO}"
+
compile "com.github.bumptech.glide:glide:${GLIDE}"
annotationProcessor "com.github.bumptech.glide:compiler:${GLIDE}"
diff --git a/build.gradle b/build.gradle
index e294df12..083ca65f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,16 +13,6 @@ buildscript {
}
}
-allprojects {
- repositories {
- jcenter()
- mavenCentral()
- maven { url "https://jitpack.io" }
- maven { url 'https://maven.google.com' }
- maven { url 'https://maven.fabric.io/public' }
- }
-}
-
task clean(type: Delete) {
delete rootProject.buildDir
}
diff --git a/gradle.properties b/gradle.properties
index dfd43e0a..b7db5d91 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,15 +19,25 @@ BUILD_TOOLS=26.0.0
VERSION_CODE=5
VERSION_NAME=0.5
-KAU=2c97b479d3
+# wait for jitpack to fix itself
+KAU=9e31fdd4f1
MATERIAL_DRAWER=5.9.2
MATERIAL_DRAWER_KT=1.0.2
+IICON_GOOGLE=3.0.1.0
IICON_MATERIAL=2.2.0.2
IICON_COMMUNITY=1.9.32.1
+SEARCH_VIEW=4.0
+RX_JAVA=2.1.0
+RX_ANDROID=2.0.1
+RX_BINDING=2.0.0
JSOUP=1.10.2
+ANKO=0.10.1
GLIDE=4.0.0-RC0
RETROFIT=2.2.0
+EVENTBUS=3.0.0
DBFLOW=4.0.2
+ROBOELECTRIC=3.3.2
+RX_PREFS=2.0.0-RC2
PAPER_PARCEL=2.0.1
SWIPE_BACK=3.1.2
CRASHLYTICS=2.6.8