aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/kotlinScripting.xml6
-rw-r--r--app/build.gradle32
-rw-r--r--build.gradle5
-rw-r--r--buildSrc/.gitignore2
-rw-r--r--buildSrc/build.gradle.kts14
-rw-r--r--buildSrc/src/main/kotlin/Versions.kt3
-rw-r--r--gradle.properties2
-rw-r--r--settings.gradle.kts4
8 files changed, 46 insertions, 22 deletions
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
new file mode 100644
index 00000000..a6fe551d
--- /dev/null
+++ b/.idea/kotlinScripting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="KotlinScriptingSettings">
+ <option name="isAutoReloadEnabled" value="true" />
+ </component>
+</project> \ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4d1ec15e..7dfb7a5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ apply from: '../spotless.gradle'
group = APP_GROUP
android {
- compileSdkVersion kau.targetSdk
- buildToolsVersion kau.buildTools
+ compileSdkVersion kau.Versions.targetSdk
+ buildToolsVersion kau.Versions.buildTools
androidGitVersion {
codeFormat = 'MMNNPPXX'
@@ -21,8 +21,8 @@ android {
defaultConfig {
applicationId "${project.APP_GROUP}." + project.APP_ID.toLowerCase(Locale.CANADA)
- minSdkVersion kau.minSdk
- targetSdkVersion kau.targetSdk
+ minSdkVersion kau.Versions.minSdk
+ targetSdkVersion kau.Versions.targetSdk
versionCode androidGitVersion.code()
versionName androidGitVersion.name()
multiDexEnabled true
@@ -175,15 +175,15 @@ repositories {
dependencies {
implementation 'androidx.exifinterface:exifinterface:1.0.0'
- androidTestImplementation kauDependency.kotlinTest
- androidTestImplementation kauDependency.espresso
- androidTestImplementation kauDependency.testRules
- androidTestImplementation kauDependency.testRunner
+ androidTestImplementation kau.Dependencies.kotlinTest
+ androidTestImplementation kau.Dependencies.espresso
+ androidTestImplementation kau.Dependencies.testRules
+ androidTestImplementation kau.Dependencies.testRunner
androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}"
- testImplementation kauDependency.kotlinTest
+ testImplementation kau.Dependencies.kotlinTest
testImplementation "org.jetbrains.kotlin:kotlin-reflect:${KOTLIN}"
- testImplementation kauDependency.junit
+ testImplementation kau.Dependencies.junit
implementation "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}"
@@ -214,18 +214,18 @@ dependencies {
// androidTestImplementation "io.mockk:mockk:${MOCKK}"
- implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kau.coroutines}"
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${kau.Versions.coroutines}"
implementation "org.apache.commons:commons-text:${COMMONS_TEXT}"
implementation "com.devbrackets.android:exomedia:${EXOMEDIA}"
- implementation "com.mikepenz:fastadapter-extensions:${kau.fastAdapter}@aar"
+ implementation "com.mikepenz:fastadapter-extensions:${kau.Versions.fastAdapter}@aar"
//noinspection GradleDependency
- implementation "com.github.bumptech.glide:okhttp3-integration:${kau.glide}"
+ implementation "com.github.bumptech.glide:okhttp3-integration:${kau.Versions.glide}"
//noinspection GradleDependency
- kapt "com.github.bumptech.glide:compiler:${kau.glide}"
+ kapt "com.github.bumptech.glide:compiler:${kau.Versions.glide}"
implementation "com.fasterxml.jackson.core:jackson-databind:${JACKSON}"
@@ -243,8 +243,8 @@ dependencies {
implementation "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
//Icons
- implementation "com.mikepenz:material-design-iconic-typeface:${kau.iconicsMaterial}@aar"
- implementation "com.mikepenz:community-material-typeface:${kau.iconicsCommunity}@aar"
+ implementation "com.mikepenz:material-design-iconic-typeface:${kau.Versions.iconicsMaterial}@aar"
+ implementation "com.mikepenz:community-material-typeface:${kau.Versions.iconicsCommunity}@aar"
implementation "org.jsoup:jsoup:${JSOUP}"
diff --git a/build.gradle b/build.gradle
index 7ccde02f..8bf49e4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
}
dependencies {
- classpath "ca.allanwang:kau:${KAU}"
// classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02'
classpath "com.android.tools.build:gradle:${ANDROID_GRADLE}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN}"
@@ -20,14 +19,12 @@ buildscript {
wrapper.setDistributionType(Wrapper.DistributionType.ALL)
}
-apply plugin: "ca.allanwang.kau"
-
task clean(type: Delete) {
delete rootProject.buildDir
}
task generateChangelogMd() {
- def changelog = kauChangelog.generate("${project.rootDir}/app/src/main/res/xml/frost_changelog.xml")
+ def changelog = kau.ChangelogGenerator.generate("${project.rootDir}/app/src/main/res/xml/frost_changelog.xml", "${project.rootDir}/docs/Changelog.md")
// If we have no changelog, something is wrong
def entry = changelog[0]
def whatsNewFile = new File("${project.rootDir}/app/src/main/play/en-US/whatsnew")
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
new file mode 100644
index 00000000..192221b4
--- /dev/null
+++ b/buildSrc/.gitignore
@@ -0,0 +1,2 @@
+.gradle/
+build/ \ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 00000000..7eda6676
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+ `kotlin-dsl`
+}
+
+repositories {
+ jcenter()
+ maven("https://jitpack.io")
+}
+
+val KAU: String = "df94b2f"
+
+dependencies {
+ implementation("ca.allanwang.kau:gradle-plugin:$KAU")
+} \ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
new file mode 100644
index 00000000..bc82b27a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,3 @@
+object Versions {
+
+} \ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b32725c3..749c1f51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.daemon = true
APP_ID=Frost
APP_GROUP=com.pitchedapps
-KAU=c6a5b4e
+KAU=1ac55ac
KOTLIN=1.3.31
# https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8a109a87..270f7597 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1 +1,3 @@
-include(":app") \ No newline at end of file
+include(":app", ":gradle-plugin")
+
+project(":gradle-plugin").projectDir = file("buildSrc") \ No newline at end of file