Commit edff5d66 authored by Daniel Wolf's avatar Daniel Wolf
Browse files
parents 8788b215 0ab068ee
......@@ -6,8 +6,5 @@ before_script:
test-build-deploy:
stage: test
script:
- ./gradlew clean assembleRelease sourcesJar javadocJar test --stacktrace
- ./gradlew publish --stacktrace
except:
- /^no_ci.*$/
- /^no_tests.*$/
\ No newline at end of file
- ./gradlew clean assembleRelease sourcesJar test --stacktrace
- ./gradlew publish --stacktrace
\ No newline at end of file
......@@ -27,7 +27,7 @@ buildscript {
ext.ANDROID_COMPILE_SDK = (System.getenv("ANDROID_COMPILE_SDK") == null ? 30 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.ANDROID_TARGET_SDK = (System.getenv("ANDROID_TARGET_SDK") == null ? ANDROID_COMPILE_SDK : System.getenv("ANDROID_TARGET_SDK")).toInteger()
ext.ANDROID_MIN_SDK = (System.getenv("ANDROID_MIN_SDK") == null ? 21 : System.getenv("ANDROID_COMPILE_SDK")).toInteger()
ext.KOTLIN_VERSION = System.getenv("KOTLIN_VERSION") == null ? "1.5.0" : System.getenv("KOTLIN_VERSION")
ext.KOTLIN_VERSION = System.getenv("KOTLIN_VERSION") == null ? "1.5.10" : System.getenv("KOTLIN_VERSION")
ext.ANDROID_GRADLE_PLUGIN_VERSION = System.getenv("ANDROID_GRADLE_PLUGIN_VERSION") == null ? "4.2.1" : System.getenv("ANDROID_GRADLE_PLUGIN_VERSION")
ext.APPCOMPAT_VERSION = "1.3.0-rc01"
ext.COROUTINE_VERSION = "1.5.0"
......@@ -46,7 +46,6 @@ buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
}
}
......
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'org.jetbrains.dokka-android'
group = 'com.frostnerd.utilskt'
ext {
......@@ -80,16 +79,6 @@ task sourcesJar(type: Jar) {
classifier = 'sources'
}
task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
outputFormat = 'javadoc'
outputDirectory = "$buildDir/javadoc"
}
task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
classifier = 'javadoc'
from "$buildDir/javadoc"
}
afterEvaluate {
publishing {
publications {
......@@ -102,9 +91,6 @@ afterEvaluate {
artifact (sourcesJar) {
classifier = 'sources'
}
artifact (javadocJar) {
classifier = 'javadoc'
}
pom.withXml {
def dependenciesNode = asNode().appendNode('dependencies')
......@@ -131,4 +117,4 @@ afterEvaluate {
}
}
}
publish.dependsOn("assembleRelease", "sourcesJar", "javadocJar")
\ No newline at end of file
publish.dependsOn("assembleRelease", "sourcesJar")
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment