Compilation is now working.
This commit is contained in:
parent
c1040ab4d5
commit
805e408c78
@ -3,26 +3,30 @@ import java.io.ByteArrayOutputStream
|
|||||||
plugins {
|
plugins {
|
||||||
id("com.android.application")
|
id("com.android.application")
|
||||||
kotlin("android")
|
kotlin("android")
|
||||||
|
kotlin("kapt")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Project.execWithOutput(cmd: String): String {
|
fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
|
||||||
val byteOut: ByteArrayOutputStream = ByteArrayOutputStream()
|
var result: String = ByteArrayOutputStream().use { outputStream ->
|
||||||
project.exec {
|
project.exec {
|
||||||
commandLine = cmd.split(" ")
|
commandLine = cmd.split(" ")
|
||||||
standardOutput = byteOut
|
standardOutput = outputStream
|
||||||
|
isIgnoreExitValue = ignore ?: false
|
||||||
|
}
|
||||||
|
outputStream.toString()
|
||||||
}
|
}
|
||||||
return byteOut.toByteArray().toString()
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
fun gitVersion(): String {
|
fun gitVersion(): String {
|
||||||
var process = ""
|
var process = ""
|
||||||
val maybeTagOfCurrentCommit = execWithOutput("git describe --contains HEAD")
|
val maybeTagOfCurrentCommit = execWithOutput("git -C ../ describe --contains HEAD", true)
|
||||||
process = if (maybeTagOfCurrentCommit.isEmpty()) {
|
process = if (maybeTagOfCurrentCommit.isEmpty()) {
|
||||||
println("No tag on current commit. Will take the latest one.")
|
println("No tag on current commit. Will take the latest one.")
|
||||||
execWithOutput("git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
|
execWithOutput("git -C ../ for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1")
|
||||||
} else {
|
} else {
|
||||||
println("Tag found on current commit")
|
println("Tag found on current commit")
|
||||||
execWithOutput("git describe --contains HEAD")
|
execWithOutput("git -C ../ describe --contains HEAD")
|
||||||
}
|
}
|
||||||
return process.replace("'", "").substring(1).replace("\\.", "").trim()
|
return process.replace("'", "").substring(1).replace("\\.", "").trim()
|
||||||
}
|
}
|
||||||
@ -98,8 +102,84 @@ android {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":shared"))
|
implementation(project(":shared"))
|
||||||
implementation("com.google.android.material:material:1.4.0")
|
implementation("com.google.android.material:material:1.5.0")
|
||||||
implementation("androidx.appcompat:appcompat:1.3.1")
|
implementation("androidx.appcompat:appcompat:1.4.1")
|
||||||
implementation("androidx.constraintlayout:constraintlayout:2.1.0")
|
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
|
||||||
|
|
||||||
|
implementation("androidx.preference:preference-ktx:1.1.1")
|
||||||
|
|
||||||
|
// Testing
|
||||||
|
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0-alpha02")
|
||||||
|
androidTestImplementation("androidx.test:runner:1.3.1-alpha02")
|
||||||
|
// Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
|
||||||
|
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.4.0-alpha02")
|
||||||
|
// Espresso-intents for validation and stubbing of Intents
|
||||||
|
androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0-alpha02")
|
||||||
|
implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))
|
||||||
|
|
||||||
|
// Android Support
|
||||||
|
implementation("androidx.appcompat:appcompat:1.4.1")
|
||||||
|
implementation("com.google.android.material:material:1.5.0")
|
||||||
|
implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
|
||||||
|
implementation("androidx.legacy:legacy-support-v4:1.0.0")
|
||||||
|
implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
|
||||||
|
implementation("androidx.browser:browser:1.4.0")
|
||||||
|
implementation("androidx.cardview:cardview:1.0.0")
|
||||||
|
implementation("androidx.annotation:annotation:1.3.0")
|
||||||
|
implementation("androidx.work:work-runtime-ktx:2.7.1")
|
||||||
|
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
|
||||||
|
implementation("org.jsoup:jsoup:1.14.3")
|
||||||
|
|
||||||
|
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
|
||||||
|
|
||||||
|
//multidex
|
||||||
|
implementation("androidx.multidex:multidex:2.0.1")
|
||||||
|
|
||||||
|
// About
|
||||||
|
implementation("com.mikepenz:aboutlibraries-core:8.9.4")
|
||||||
|
implementation("com.mikepenz:aboutlibraries:8.9.4")
|
||||||
|
implementation("com.mikepenz:aboutlibraries-definitions:8.9.4")
|
||||||
|
|
||||||
|
// Async
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
|
||||||
|
|
||||||
|
// Retrofit + http logging + okhttp
|
||||||
|
implementation("com.squareup.retrofit2:retrofit:2.9.0")
|
||||||
|
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")
|
||||||
|
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
|
||||||
|
implementation("com.burgstaller:okhttp-digest:2.5")
|
||||||
|
|
||||||
|
// Material-ish things
|
||||||
|
implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
|
||||||
|
implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")
|
||||||
|
|
||||||
|
// glide
|
||||||
|
kapt("com.github.bumptech.glide:compiler:4.11.0")
|
||||||
|
implementation("com.github.bumptech.glide:okhttp3-integration:4.1.1")
|
||||||
|
|
||||||
|
// Drawer
|
||||||
|
implementation("com.mikepenz:materialdrawer:8.4.5")
|
||||||
|
|
||||||
|
// Themes
|
||||||
|
implementation("com.52inc:scoops:1.0.0")
|
||||||
|
implementation("com.jaredrummler:colorpicker:1.1.0")
|
||||||
|
implementation("com.github.rubensousa:floatingtoolbar:1.5.1")
|
||||||
|
|
||||||
|
// Pager
|
||||||
|
implementation("me.relex:circleindicator:2.1.6")
|
||||||
|
implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
|
||||||
|
|
||||||
|
//PhotoView
|
||||||
|
implementation("com.github.chrisbanes:PhotoView:2.3.0")
|
||||||
|
|
||||||
|
implementation("androidx.core:core-ktx:1.7.0")
|
||||||
|
|
||||||
|
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-common-java8:2.4.0")
|
||||||
|
|
||||||
|
implementation("androidx.room:room-ktx:2.4.0-beta01")
|
||||||
|
kapt("androidx.room:room-compiler:2.4.0-beta01")
|
||||||
|
|
||||||
|
implementation("android.arch.work:work-runtime-ktx:1.0.1")
|
||||||
}
|
}
|
@ -14,6 +14,8 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
jcenter()
|
||||||
|
maven { url = uri("https://www.jitpack.io") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,13 +1,20 @@
|
|||||||
#Gradle
|
## For more details on how to configure your build environment visit
|
||||||
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||||
|
#
|
||||||
#Kotlin
|
# Specifies the JVM arguments used for the daemon process.
|
||||||
|
# The setting is particularly useful for tweaking memory settings.
|
||||||
|
# Default value: -Xmx1024m -XX:MaxPermSize=256m
|
||||||
|
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||||
|
#
|
||||||
|
# When configured, Gradle will run in incubating parallel mode.
|
||||||
|
# This option should only be used with decoupled projects. More details, visit
|
||||||
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
|
# org.gradle.parallel=true
|
||||||
|
#Tue Mar 22 16:50:00 CET 2022
|
||||||
kotlin.code.style=official
|
kotlin.code.style=official
|
||||||
|
kotlin.mpp.enableCInteropCommonization=true
|
||||||
#Android
|
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
||||||
android.useAndroidX=true
|
|
||||||
|
|
||||||
#MPP
|
|
||||||
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
|
||||||
kotlin.native.enableDependencyPropagation=false
|
kotlin.native.enableDependencyPropagation=false
|
||||||
kotlin.mpp.enableCInteropCommonization=true
|
android.useAndroidX=true
|
||||||
|
android.enableJetifier=true
|
||||||
|
kotlin.mpp.enableGranularSourceSetsMetadata=true
|
||||||
|
Loading…
Reference in New Issue
Block a user