Skip to content

Commit

Permalink
Merge branch 'master' of ssh://github.com/johnrengelman/shadow into m…
Browse files Browse the repository at this point in the history
…inimize-project-excludes-tests
  • Loading branch information
rpalcolea committed Dec 18, 2018
2 parents 992add8 + 1f1d216 commit e72c396
Show file tree
Hide file tree
Showing 74 changed files with 17,968 additions and 954 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ build
out
.gradletasknamecache
.gradle-test-kit
classes/
classes/
node_modules/
yarn-error.log
src/docs/.vuepress/dist/
.DS_Store
8 changes: 2 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@ buildscript {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11'
classpath 'org.asciidoctor:asciidoctorj-groovy-dsl:1.0.0.preview2'
classpath "com.bluepapa32:gradle-watch-plugin:0.1.5"
classpath "org.kordamp.gradle:livereload-gradle-plugin:0.2.1"
classpath 'org.ajoberstar:grgit:2.1.1'
classpath 'org.ajoberstar:gradle-git-publish:0.3.3'
classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
}
}

Expand Down Expand Up @@ -57,7 +53,7 @@ buildScan {

apply from: file('gradle/docs.gradle')
apply from: file('gradle/publish.gradle')
apply from: file('gradle/asciidoc.gradle')
apply from: file('gradle/vuepress.gradle')
apply from: file('gradle/ghPages.gradle')
apply from: file('gradle/dependencies.gradle')

Expand Down
28 changes: 0 additions & 28 deletions gradle/asciidoc.gradle

This file was deleted.

10 changes: 7 additions & 3 deletions gradle/ghPages.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.apache.tools.ant.filters.ReplaceTokens

apply plugin: 'org.ajoberstar.git-publish'

if (project.hasProperty('githubToken')) {
Expand All @@ -10,12 +12,14 @@ gitPublish {
branch = 'gh-pages'

contents {
from 'build/asciidoc/html5'
from 'build/site'
from '.circleci'
into('api') {
from project.tasks.groovydoc
}
filter(ReplaceTokens, tokens: [version: project.version])
}
}

tasks.gitPublishPush.dependsOn asciidoctor
tasks.gitPublishPush.dependsOn groovydoc
tasks.gitPublishCopy.dependsOn yarn_build
tasks.gitPublishCopy.dependsOn groovydoc
8 changes: 8 additions & 0 deletions gradle/vuepress.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
apply plugin: "com.moowork.node"

node {
yarnVersion = '1.5.1'
}

tasks.yarn_build.inputs.files project.fileTree('src/docs')
tasks.yarn_build.outputs.dir project.file('build/site')
16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "shadow",
"version": "1.0.0",
"main": "index.js",
"repository": "[email protected]:johnrengelman/shadow.git",
"author": "John Engelman <[email protected]>",
"license": "MIT",
"devDependencies": {
"vuepress": "^0.14.2",
"prismjs": "^1.15.0"
},
"scripts": {
"build": "vuepress build src/docs",
"start": "vuepress dev src/docs"
}
}
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@

rootProject.name = 'shadow'
enableFeaturePreview('STABLE_PUBLISHING')
13 changes: 13 additions & 0 deletions src/docs/.vuepress/components/ApiLink.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<a v-bind:href="absolutePath"><slot/></a>
</template>

<script>
export default {
data () {
return {
absolutePath: "http://imperceptiblethoughts.com/shadow/api/com/github/jengelman/gradle/plugins/shadow/" + this.path
}
}
}
</script>
35 changes: 35 additions & 0 deletions src/docs/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module.exports = {
base: "/shadow/",
dest: "build/site",
ga: "UA-321220-4",
themeConfig: {
repo: "johnrengelman/shadow",
editLinks: true,
editLinkText: 'Help improve these docs!',
logo: '/logo+type.svg',
docsDir: 'src/docs',
title: 'Gradle Shadow Plugin',
nav: [
{ text: 'User Guide', link: '/introduction/' }
],
sidebar: [
'/',
'/introduction/',
'/getting-started/',
'/configuration/',
'/configuration/filtering/',
'/configuration/dependencies/',
'/configuration/merging/',
'/configuration/relocation/',
'/configuration/minimizing/',
'/configuration/reproducible-builds/',
'/custom-tasks/',
'/application-plugin/',
'/publishing/',
'/multi-project/',
'/plugins/',
'/changes/',
'/about/'
]
}
}
3 changes: 3 additions & 0 deletions src/docs/.vuepress/override.styl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$accentColor = #B66E3C
$textColor = #5F3416
$borderColor = #9FB2CC
110 changes: 110 additions & 0 deletions src/docs/.vuepress/public/logo+type.orig.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e72c396

Please sign in to comment.