Skip to content

Commit

Permalink
Updated build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
kpmmmurphy committed Nov 15, 2018
1 parent af0c577 commit 2837308
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 26 deletions.
22 changes: 11 additions & 11 deletions alerter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'org.jetbrains.dokka'
apply from: rootProject.file('quality.gradle')

final String GROUP_ID = "com.tapadoo.android"
final String VERSION = "3.0.1"
final String VERSION = "3.0.2"
final String DESCRIPTION = "An Android Alerting Library"
final String GITHUB_URL = "https://github.com/Tapadoo/Alerter"

Expand Down Expand Up @@ -79,6 +79,16 @@ def pomConfig = {
}
}

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}

task javadocJar(type: Jar) {
classifier = 'javadoc'
from "$buildDir/javadoc"
}

// Create the publication with the pom configuration:
publishing {
publications {
Expand Down Expand Up @@ -142,16 +152,6 @@ task showBintrayProps {
}
}

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}

task javadocJar(type: Jar) {
classifier = 'javadoc'
from "$buildDir/javadoc"
}

dokka {
outputFormat = 'javadoc'
outputDirectory = "$buildDir/javadoc"
Expand Down
13 changes: 3 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.2.71'
ext.kotlin_version = '1.3.0'

apply from: 'dependencies.gradle'

Expand All @@ -9,9 +9,7 @@ buildscript {
}

dependencies {

classpath 'com.android.tools.build:gradle:3.3.0-alpha12'

classpath 'com.android.tools.build:gradle:3.4.0-alpha03'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
}
Expand All @@ -25,9 +23,4 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
}

task wrapper(type: Wrapper) {
gradleVersion = "4.9"
distributionType = "all"
}
}
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ext {
compileSdkVersion = 27
compileSdkVersion = 28
minSdkVersion = 14
targetSdkVersion = 27
targetSdkVersion = 28

buildToolsVersion = '28.0.2'
buildToolsVersion = '28.0.3'

sourceCompatibilityVersion = JavaVersion.VERSION_1_8
targetCompatibilityVersion = JavaVersion.VERSION_1_8
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Oct 01 10:40:34 IST 2018
#Thu Nov 15 21:06:03 GMT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-milestone-1-all.zip

0 comments on commit 2837308

Please sign in to comment.