Skip to content

Commit

Permalink
Prepare release 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
pron committed Jan 22, 2014
1 parent c29fd00 commit 61231e6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 37 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
*~
_site/
/docs/.pygments-cache/
/docs/javadoc/
/private/
/dist/
/artifacts
Expand Down
35 changes: 5 additions & 30 deletions build.gradle
Expand Up @@ -3,7 +3,7 @@ sourceCompatibility = '1.7'

[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
group = "co.paralleluniverse"
version = "1.3-SNAPSHOT"
version = "1.3"
status = "integration"
description = "A high-performance in-memory data-grid."
ext.url = "http://puniverse.github.com/galaxy"
Expand Down Expand Up @@ -82,7 +82,7 @@ dependencies {

///////// Doduments
configure (javadoc) {
destinationDir = file("$distDir/docs/javadoc")
destinationDir = file("docs/javadoc")
options.links = [
"http://docs.oracle.com/javase/7/docs/api/",
"http://docs.guava-libraries.googlecode.com/git-history/v12.0/javadoc/"
Expand Down Expand Up @@ -118,19 +118,7 @@ configure (javadoc) {
]
}

task generateDocs(type:Exec) {
workingDir 'docs'
environment JAVADOC_URL: "../javadoc"
commandLine 'make','html'
outputs.dir "$workingDir/build"
inputs.dir "$workingDir/src"
}

////////// Distribution
task(copyDocsToDist, dependsOn:'generateDocs', type: Copy) {
from 'docs/build/html'
into "$distDir/docs"
}
task copyDependenciesToDist(type:Copy) {
from configurations.runtime
into "$distDir/lib"
Expand Down Expand Up @@ -164,12 +152,10 @@ jar {
)
}
}
task distNoDocs {
dependsOn copyDependenciesToDist,copyConfigToDist,jar,sourcesJar,javadocJar,srcZip,javadoc
}
task dist {
dependsOn distNoDocs,copyDocsToDist
dependsOn copyDependenciesToDist,copyConfigToDist,jar,sourcesJar,javadocJar,srcZip,javadoc
}

defaultTasks 'distNoDocs'
task distZip(type:Zip, dependsOn: dist) {
archiveName project.name+"-"+project.version+".zip"
Expand All @@ -185,17 +171,6 @@ buildscript {
repositories { mavenCentral() }
dependencies { classpath 'org.ajoberstar:gradle-git:0.6.3' }
}
addGhPages {
dependsOn javadoc,copyDocsToDist
}
githubPages {
repoUri = 'https://github.com/puniverse/galaxy.git'
pages {
from(javadoc.destinationDir) { into 'javadoc' }
from('docs/build/html')
// from(distZip.outputs.files) { into '_static'}
}
}

///////// Publish Artifacts
apply plugin: 'maven'
Expand Down Expand Up @@ -294,7 +269,7 @@ tasks.withType(Test) {
systemProperty "Log4jContextSelector", "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
useJUnit()
doLast() {
println "file://" + testReportDir + "/index.html"
println "file://" + getReports().getHtml().getDestination() + "/index.html"
}
}

Expand Down
6 changes: 1 addition & 5 deletions docs/_config.yml
Expand Up @@ -5,15 +5,11 @@ safe: false
baseurl: /galaxy

kramdown:
toc_levels: [1,2,3]
use_coderay: false
coderay:
enable_coderay: false
coderay_line_numbers: nil
coderay_css: class

# Site globals used throughout docs.
project: Galaxy
version: 1.3
github: puniverse/galaxy
google_group: "https://groups.google.com/forum/#!forum/galaxy-user"
ga_tracking_id: UA-25007319-2
Expand Down
1 change: 0 additions & 1 deletion docs/_includes/header.html
@@ -1,4 +1,3 @@

<header>
<div class="container">
<a href="{{site.baseurl}}" id="logo">Parallel Universe</a>
Expand Down
8 changes: 7 additions & 1 deletion docs/index.md
Expand Up @@ -28,6 +28,12 @@ Quasar is developed by [Parallel Universe] and released as free software, dual-l

## News

### January 22, 2014

Galaxy 1.3 has been released.

[Galaxy's Networking](http://blog.paralleluniverse.co/post/29085615915/galaxy-internals-part-3). Part 3 of the Galaxy Internals blog post series.

### August 9, 2012

[Galaxy's Networking](http://blog.paralleluniverse.co/post/29085615915/galaxy-internals-part-3). Part 3 of the Galaxy Internals blog post series.
Expand Down Expand Up @@ -89,7 +95,7 @@ Add the following dependency to Maven:
<dependency>
<groupId>co.paralleluniverse</groupId>
<artifactId>galaxy</artifactId>
<version>0.1.2</version>
<version>{{site.version}}</version>
</dependency>
~~~

Expand Down

0 comments on commit 61231e6

Please sign in to comment.