Skip to content

Commit

Permalink
Add javadoc/sources to deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
aikar committed Mar 11, 2018
1 parent 596132b commit b397c4e
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 49 additions & 6 deletions build.gradle
@@ -1,13 +1,10 @@
plugins {
id 'io.franzbecker.gradle-lombok' version '1.11' apply false
}
subprojects {
buildscript {
repositories {
mavenCentral()
}
}

import io.franzbecker.gradle.lombok.task.DelombokTask

subprojects {

apply plugin: 'java'
apply plugin: 'maven-publish'
Expand All @@ -25,9 +22,55 @@ subprojects {
sha256 = ""
}


// Delombok Task
task delombok(type: DelombokTask, dependsOn: compileJava) {
ext.outputDir = file("$buildDir/delombok")
classpath += project.configurations.compileOnly
outputs.dir(outputDir)
sourceSets.main.java.srcDirs.each {
inputs.dir(it)
args(it, "-d", outputDir)
}
}

//noinspection GroovyAssignabilityCheck
task sourcesJar(type: Jar, dependsOn: classes) {
dependsOn delombok
classifier = 'sources'

from sourceSets.main.allSource
}
// Javadoc Task
javadoc {
dependsOn delombok

source = file( "${buildDir}/${delombok.name}" )
failOnError = true
}

//noinspection GroovyAssignabilityCheck
task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
classifier = 'javadoc'
}

artifacts {
archives javadocJar
archives sourcesJar
}

task deploy() {
dependsOn build
dependsOn javadoc
dependsOn publish
}

publishing {
publications {
maven(MavenPublication) {
artifact sourcesJar
artifact javadocJar
from components.java
}
}
Expand Down
15 changes: 14 additions & 1 deletion core/src/main/java/co/aikar/db/DatabaseOptions.java
Expand Up @@ -2,24 +2,37 @@

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NonNull;

import java.util.concurrent.ExecutorService;
import java.util.function.Consumer;
import java.util.logging.Logger;

@SuppressWarnings("UnusedAssignment")
@Builder(toBuilder = true) @AllArgsConstructor
@Builder(toBuilder = true) @Data
public class DatabaseOptions {
private static final DatabaseTiming NULL_TIMING = new NullDatabaseTiming();
/**
* JDBC DSN to connect to
*/
@NonNull String dsn;
/**
* JDBC Driver name to load
*/
@NonNull String databaseClassName;

@Builder.Default String poolName = "DB";
@Builder.Default String defaultIsolationLevel = "TRANSACTION_READ_COMMITTED";
@Builder.Default boolean useOptimizations = true;

/**
* For Async queries, minimum threads in the pool to use.
*/
@Builder.Default int minAsyncThreads = Math.min(Runtime.getRuntime().availableProcessors(), 2);
/**
* For Async queries, maximum threads in the pool to use.
*/
@Builder.Default int maxAsyncThreads = Runtime.getRuntime().availableProcessors();
@Builder.Default int asyncThreadTimeout = 60;
@Builder.Default TimingsProvider timingsProvider = (name, parent) -> NULL_TIMING;
Expand Down

0 comments on commit b397c4e

Please sign in to comment.