Skip to content
This repository was archived by the owner on Apr 11, 2021. It is now read-only.

Commit 439375d

Browse files
authored
Merge pull request #32 from GlitchLib/dev
Release v0.6.0
2 parents 52d2f49 + 8caafe2 commit 439375d

24 files changed

+498
-402
lines changed

.travis.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,34 @@ after_script: ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
2424
jobs:
2525
include:
2626
- stage: deploy
27+
name: "Documentation"
2728
jdk: openjdk11
28-
install: chmod +x ./javadoc.sh
29-
script: ./javadoc.sh
29+
script: ./gradlew publishDoc
3030
if: tag IS present
31+
deploy: &pages
32+
provider: pages
33+
repo: GlitchLib/docs
34+
target-branch: master
35+
skip-cleanup: true
36+
github-token: $GITHUB_TOKEN
37+
keep-history: true
38+
verbose: true
39+
committer-from-gh: true
40+
local-dir: build/docs
41+
on:
42+
tags: true
3143
- stage: deploy
44+
name: "Upload to Bintray"
3245
jdk: openjdk8
3346
install: skip
34-
script: ./gradlew bintrayUpload -x test
35-
if: tag IS present
47+
script: ./gradlew bintrayUpload publishRelease -x test
48+
if: tag IS present
49+
deploy: &releases
50+
provider: releases
51+
api_key: $GITHUB_TOKEN
52+
file_glob: true
53+
file: ./build/release/*.jar
54+
prerelease: true
55+
skip_cleanup: true
56+
on:
57+
tags: true

LICENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22
=====================
33

4-
Copyright © 2018 [Damian Staszewski](https://github.com/stachu540)
4+
Copyright © 2019 [Damian Staszewski](https://github.com/stachu540)
55

66
Permission is hereby granted, free of charge, to any person
77
obtaining a copy of this software and associated documentation

all/build.gradle

Lines changed: 0 additions & 36 deletions
This file was deleted.

all/build.gradle.kts

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
import org.jetbrains.dokka.gradle.DokkaTask
3+
4+
val projectList = rootProject.subprojects.filter {
5+
!arrayOf("bom", "auth", project.name, rootProject.name).contains(it.name) && !it.sourceSets.main.get().allSource.isEmpty
6+
}.toSet()
7+
8+
dependencies {
9+
projectList.forEach {
10+
compile(it)
11+
}
12+
}
13+
14+
tasks {
15+
sourceJar.get().enabled = false
16+
17+
javadoc {
18+
isFailOnError = false
19+
title = "Gltich ${rootProject.version} API"
20+
21+
options.delegateClosureOf<StandardJavadocDocletOptions> {
22+
windowTitle = "Glitch ${rootProject.version}"
23+
addStringOption("Xdoclint:none", "-quiet")
24+
isAuthor = true
25+
}
26+
projectList.forEach {
27+
val jdoc = it.tasks.getByName<Javadoc>("javadoc")
28+
29+
source += jdoc.source
30+
classpath += jdoc.classpath
31+
excludes += jdoc.excludes
32+
includes += jdoc.includes
33+
}
34+
}
35+
36+
dokka {
37+
sourceDirs = files(projectList.flatMap { it.sourceSets.main.get().allSource }.filter { it.name.endsWith(".kt") }.toList())
38+
classpath = files(projectList.flatMap { it.tasks.getByName<DokkaTask>("dokka").classpath }.toList())
39+
}
40+
41+
withType<ShadowJar> {
42+
enabled = true
43+
}
44+
}

bom/build.gradle

Lines changed: 0 additions & 23 deletions
This file was deleted.

bom/build.gradle.kts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
plugins {
2+
id("io.spring.dependency-management") version "1.0.6.RELEASE"
3+
}
4+
5+
description = "Bills of Materials (BOM) for Glitch packages"
6+
7+
tasks {
8+
compileJava.get().enabled = false
9+
javadoc.get().enabled = false
10+
withType<Jar> {
11+
enabled = false
12+
}
13+
test.get().enabled = false
14+
}
15+
16+
dependencyManagement {
17+
dependencies {
18+
rootProject.subprojects.forEach {
19+
if (!arrayOf("bom", "all").contains(it.name) && !it.sourceSets.main.get().allSource.isEmpty) {
20+
dependency("${it.group}:${it.base.archivesBaseName}:${it.version}")
21+
}
22+
}
23+
}
24+
}
25+

0 commit comments

Comments
 (0)