Skip to content

Commit

Permalink
Build passing'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmcclean committed May 12, 2022
1 parent b6664de commit de74896
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 28 deletions.
23 changes: 21 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,23 @@ subprojects {
java {
withJavadocJar()
withSourcesJar()

targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}
/**
signing {
sign publishing.publications.mavenJava
}
**/

if (JavaVersion.current().isJava8Compatible()) {
allprojects {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}
}
}
javadoc {
if(JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
Expand All @@ -52,6 +61,14 @@ subprojects {
signing {
sign configurations.archives
}
dependencies {
compileOnly "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"

// Test Dependencies
testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
}
publishing {
publications {
mavenJava(MavenPublication) {
Expand Down Expand Up @@ -116,11 +133,13 @@ subprojects {

}
}

/**
allprojects {
tasks.withType(JavaCompile) {
options.fork = true
options.incremental = true
}
}
**/
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import cyclops.data.Seq;
import cyclops.reactive.ReactiveSeq;
import cyclops.reactive.Spouts;
import lombok.Builder;
import lombok.experimental.Wither;
import org.reactivestreams.Publisher;

import com.oath.cyclops.internal.react.FutureStreamImpl;
Expand All @@ -35,8 +37,7 @@

import lombok.Getter;
import lombok.ToString;
import lombok.experimental.Builder;
import lombok.experimental.Wither;


/**
*
Expand Down
18 changes: 6 additions & 12 deletions cyclops/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
buildscript {
repositories {
jcenter()
}

dependencies {
classpath 'com.bmuschko:gradle-nexus-plugin:2.2'
}
}
/**
plugins {id 'me.champeau.gradle.jmh' version '0.2.0'}**/


def custom = { "$rootDir/gradle/${it}.gradle" } //find custom plugins locally
Expand Down Expand Up @@ -45,7 +34,7 @@ dependencies {
api 'org.agrona:Agrona:0.9.1'
api 'org.reactivestreams:reactive-streams:1.0.0'
api 'io.kindedj:kindedj:'+kindedJVersion
compileOnly 'org.projectlombok:lombok:1.16.20'

testImplementation group: 'io.projectreactor', name: 'reactor-test', version: '3.2.2.RELEASE'
testImplementation 'com.github.stefanbirkner:system-rules:1.10.0'
testImplementation 'io.projectreactor:reactor-core:3.2.2.RELEASE'
Expand All @@ -59,6 +48,7 @@ dependencies {
testImplementation(group: 'org.hibernate', name: 'hibernate-core', version: '5.1.0.Final')
testImplementation (group: 'org.hibernate', name: 'hibernate-entitymanager', version: '5.1.0.Final')
testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.0.0'

jmh 'com.github.akarnokd:ixjava:1.0.0-RC5'
jmh 'io.vavr:vavr:0.9.2'
jmh 'com.google.guava:guava:19.0'
Expand Down Expand Up @@ -95,6 +85,10 @@ test {
testLogging {
events "started", "passed", "skipped", "failed"//, "standardOut", "standardError"
}
minHeapSize = "512m" // initial heap size
maxHeapSize = "1024m" // maximum heap size
jvmArgs '-XX:MaxPermSize=256m' // mem argument for the test JVM

}

test {
Expand Down
14 changes: 6 additions & 8 deletions cyclops/src/jmh/java/cyclops/VectorOps.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package cyclops;


import com.google.common.collect.ImmutableList;
import cyclops.data.Vector;
import cyclops.data.tuple.Tuple;
import cyclops.reactive.collections.immutable.VectorX;
import io.vavr.collection.Stream;

import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand All @@ -17,7 +14,7 @@
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.Warmup;

import java.util.List;

import java.util.concurrent.TimeUnit;


Expand All @@ -26,13 +23,13 @@ public class VectorOps {


Vector<Integer> vector;
VectorX<Integer> vectorX;
// VectorX<Integer> vectorX;
io.vavr.collection.Vector<Integer> js;

@Setup
public void before() {
vector = Vector.range(0, 100_000);
vectorX = VectorX.range(0, 100_000);
// vectorX = VectorX.range(0, 100_000);
js = io.vavr.collection.Vector.range(0, 100_000);

}
Expand Down Expand Up @@ -83,7 +80,7 @@ public void vavrOps() {

}


/**
@Benchmark
@BenchmarkMode(Mode.SampleTime)
@OutputTimeUnit(TimeUnit.MILLISECONDS)
Expand All @@ -110,6 +107,7 @@ public void vectorXOps() {
}
**/

}

Expand Down
2 changes: 1 addition & 1 deletion cyclops/src/jmh/java/cyclops/data/vector/VectorMap.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cyclops.data.vector;

import cyclops.data.Vector;
import cyclops.reactive.collections.immutable.VectorX;

import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
Expand Down
4 changes: 2 additions & 2 deletions cyclops/src/main/java/cyclops/control/Option.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@see Maybe is a lazy / reactive sub-class of Option
**/
public interface Option<T> extends To<Option<T>>,
public interface Option<T> extends To<Option<T>>,
OrElseValue<T,Option<T>>,
MonadicValue<T>,
Zippable<T>,
Expand Down Expand Up @@ -102,7 +102,7 @@ static <T> Option<T> none() {
}

static <T> Option<T> some(T value){
return new Option.Some<>(value);
return new Option.Some<T>(value);
}

static <T> Option<T> fromFuture(Future<T> future){
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ reactorVersion=3.3.1.RELEASE
rxJava2Version=2.2.16
kindedJVersion=1.1.0
hamcrestVersion=1.3
lombokVersion=1.18.4
lombokVersion=1.16.20
jacksonVersion=2.10.1


Expand Down

0 comments on commit de74896

Please sign in to comment.