Skip to content
Snippets Groups Projects
Commit db0a2203 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Improved build files, updated libraries

parent 480e994c
Branches
Tags
No related merge requests found
......@@ -92,7 +92,7 @@ dependencies {
implementation(kotlin("stdlib", "1.2.30"))
// App Compat
withVersion("27.0.2") {
withVersion("27.1.0") {
implementation("com.android.support", "appcompat-v7", version)
implementation("com.android.support", "design", version)
implementation("com.android.support", "customtabs", version)
......@@ -111,7 +111,7 @@ dependencies {
}
// App Arch Persistence
withVersion("1.1.0-alpha2") {
withVersion("1.1.0-alpha3") {
implementation("android.arch.persistence.room", "runtime", version)
implementation("android.arch.persistence.room", "rxjava2", version)
kapt("android.arch.persistence.room", "compiler", version)
......@@ -119,7 +119,7 @@ dependencies {
}
// App Arch Paging
implementation("android.arch.paging", "runtime", "1.0.0-alpha5") {
implementation("android.arch.paging", "runtime", "1.0.0-alpha6") {
exclude(group = "junit", module = "junit")
}
......@@ -157,36 +157,4 @@ dependencies {
androidTestImplementation("com.android.support.test", "rules", version)
}
androidTestImplementation("com.android.support.test.espresso", "espresso-core", "3.0.1")
}
/*
tasks.withType(KotlinCompile::class.java) {
kotlinOptions {
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions"
)
}
}
*/
fun cmd(vararg command: String) = try {
val stdOut = ByteArrayOutputStream()
exec {
commandLine(*command)
standardOutput = stdOut
}
stdOut.toString(Charsets.UTF_8.name()).trim()
} catch (e: Throwable) {
e.printStackTrace()
null
}
fun Project.properties(fileName: String): Properties? {
val file = file(fileName)
if (!file.exists())
return null
val props = Properties()
props.load(file.inputStream())
return props
}
\ No newline at end of file
import org.gradle.api.Project
import java.io.ByteArrayOutputStream
import java.util.*
fun Project.cmd(vararg command: String) = try {
val stdOut = ByteArrayOutputStream()
exec {
commandLine(*command)
standardOutput = stdOut
}
stdOut.toString(Charsets.UTF_8.name()).trim()
} catch (e: Throwable) {
e.printStackTrace()
null
}
fun Project.properties(fileName: String): Properties? {
val file = file(fileName)
if (!file.exists())
return null
val props = Properties()
props.load(file.inputStream())
return props
}
\ No newline at end of file
......@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-4.5.1-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-4.6-all.zip
......@@ -9,11 +9,13 @@ plugins {
kotlin("kapt")
}
val appCompatVersion = "27.0.2"
dependencies {
implementation(kotlin("stdlib", "1.2.30"))
implementation("com.android.support", "support-annotations", "27.0.2")
withVersion("27.1.0") {
implementation("com.android.support", "support-annotations", version)
}
implementation("org.threeten", "threetenbp", "1.3.6")
implementation("io.reactivex.rxjava2:rxjava:2.1.9")
......@@ -21,15 +23,4 @@ dependencies {
kapt(project(":invokergenerator"))
testImplementation("junit", "junit", "4.12")
}
/*
tasks.withType(KotlinCompile::class.java) {
kotlinOptions {
freeCompilerArgs = listOf(
"-Xno-param-assertions",
"-Xno-call-assertions"
)
}
}
*/
}
\ No newline at end of file
......@@ -14,7 +14,7 @@ android {
dependencies {
// App Compat
withVersion("27.0.2") {
withVersion("27.1.0") {
implementation("com.android.support", "support-v4", version)
implementation("com.android.support", "support-annotations", version)
implementation("com.android.support", "recyclerview-v7", version)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment