🔖 1.2.2 ⬆️ upgrade buildscripts, native-library-loader 1.2.2

build.gradle

@@ -1,106 +1,24 @@
 plugins {
-   id 'us.ihmc.gradle.ihmc-build' version '0.0.9'
-   id 'org.hidetake.ssh' version '2.1.1'
+   id("us.ihmc.ihmc-build") version "0.15.5"
+   id("us.ihmc.ihmc-ci") version "4.8"
+   id("org.hidetake.ssh") version "2.9.0"
+   id("application")
 }
 
-apply plugin: 'application'
-apply plugin: 'java'
-apply plugin: 'maven-publish'
+ihmc {
+   group = "us.ihmc"
+   version = "1.2.2"
+   vcsUrl = "https://github.com/ihmcrobotics/ihmc-realtime"
+   openSource = true
 
-sourceCompatibility = 1.7
-version = '1.2.1'
-
-project.ext.fullVersion = version
-project.ext.vcsUrl = "https://github.com/ihmcrobotics/ihmc-hierarchical-kinematics"
-project.ext.licenseURL = "http://www.apache.org/licenses/LICENSE-2.0.txt"
-project.ext.licenseName = "Apache License, Version 2.0"
-project.ext.bintrayLicenseName = "Apache-2.0"
-
-repositories {
-  jcenter()
-  mavenCentral()
-  maven {
-      url  "http://dl.bintray.com/ihmcrobotics/maven-release"
-  }
-}
-
-dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.11'
-    compile group: 'us.ihmc', name: 'IHMCNativeLibraryLoader', version: '1.0'
+   configureDependencyResolution()
+   configurePublications()
 }
 
-task sourceJar(type: Jar) {
-	from sourceSets.main.allJava
-}
-
-jar {
-   manifest {
-      attributes(
-      "Created-By": "IHMC Gradle Build Script",
-      "Implementation-Title": project.name,
-      "Implementation-Version": project.version,
-      "Implementation-Vendor": "IHMC",
-
-      "Bundle-Name": project.name,
-      "Bundle-Version": project.version,
-      "Bundle-License": "http://www.apache.org/licenses/LICENSE-2.0.txt",
-      "Bundle-Vendor": "IHMC")
-   }
+mainDependencies {
+   compile("us.ihmc:ihmc-native-library-loader:1.1")
 }
 
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-
-			groupId 'us.ihmc'
-			artifactId project.name
-			version "$version"
-			from components.java
-
-			pom.withXml {
-                asNode().children().last() + {
-                    resolveStrategy = Closure.DELEGATE_FIRST
-                    name project.name
-                    description 'IHMCRealtime provides a JNI-backed threading library for attaching real-time POSIX threads to a running JVM process, allowing for deterministic computation of tasks. A JNI-backed CPU Affinity library and pure Java data structures for lockless inter-thread communication'
-                    url 'https://github.com/ihmcrobotics/ihmc-realtime'
-                    licenses {
-                        license {
-                            name 'The Apache Software License, Version 2.0'
-                            url 'http://www.apache.org/license/LICENSE-2.0.txt'
-                            distribution 'repo'
-                        }
-                    }
-                    developers {
-                        developer {
-                            id 'jsmith'
-                            name 'Jesper Smith'
-                            email 'jsmith@ihmc.us'
-                        }
-                        developer {
-                        	id 'dstephen'
-                        	name 'Douglas Stephen'
-                        	email 'dstephen@ihmc.us'
-                        }
-                        developer {
-                        	id 'alesman'
-                        	name 'Alex Lesman'
-                        }
-                    }
-                }
-
-        	}
-
-			artifact sourceJar {
-				classifier "sources"
-			}
-		}
-
-	}
-}
-
-def labels = ['ihmc', 'robotics', 'java', 'embedded', 'real-time']
-ihmc.configureForIHMCOpenSourceBintrayPublish(false, "mavenJava", "maven-release", labels)
-
 remotes {
    rtComputer {
       host = remoteHost

gradle.properties

@@ -1,3 +1,10 @@
+kebabCasedName = ihmc-realtime
+pascalCasedName = IHMCRealtime
+extraSourceSets = ["test"]
+publishUrl = local
+compositeSearchHeight = 0
+excludeFromCompositeBuild = false
+
 remoteHost = 0.0.0.0
 remoteUser = shadylady
 remotePass = password

settings.gradle

@@ -1 +1,18 @@
-rootProject.name="IHMCRealtime"
+buildscript {
+   repositories {
+      maven { url "https://plugins.gradle.org/m2/" }
+      mavenLocal()
+   }
+   dependencies {
+      classpath "us.ihmc:ihmc-build:0.15.5"
+   }
+}
+
+import us.ihmc.build.IHMCSettingsConfigurator
+
+/**
+ * Browse source at https://github.com/ihmcrobotics/ihmc-build
+ */
+def ihmcSettingsConfigurator = new IHMCSettingsConfigurator(settings, logger, ext)
+ihmcSettingsConfigurator.checkRequiredPropertiesAreSet()
+ihmcSettingsConfigurator.configureExtraSourceSets()

test/us/ihmc/realtime/MonotonicTimeTest.java → src/test/java/us/ihmc/realtime/MonotonicTimeTest.java

@@ -1,10 +1,9 @@
 package us.ihmc.realtime;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class MonotonicTimeTest
 {
@@ -50,8 +49,8 @@ public void testNormalize()
             seconds--;
          }
 
-         assertEquals(seconds, time.seconds());
-         assertEquals(nanoseconds, time.nanoseconds());
+         Assertions.assertEquals(seconds, time.seconds());
+         Assertions.assertEquals(nanoseconds, time.nanoseconds());
       }
    }
 

test/us/ihmc/realtime/concurrent/ConcurrentCopierTest.java → src/test/java/us/ihmc/realtime/concurrent/ConcurrentCopierTest.java

@@ -17,18 +17,17 @@
  */
 package us.ihmc.realtime.concurrent;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import us.ihmc.concurrent.Builder;
 import us.ihmc.concurrent.ConcurrentCopier;
 
 public class ConcurrentCopierTest
 {
-   @Test(timeout=300000)
+   @Test
    public void singleThreadTest()
    {
       final long iterations = 10L;
@@ -54,7 +53,7 @@ public void singleThreadTest()
       }
    }
 
-   @Test(timeout=300000)
+   @Test
    public void test()
    {
       final long iterations = 1000000L;
@@ -116,7 +115,7 @@ public void test()
          Random random = new Random(seed);
          for(int i = 0; i < values.length; i++)
          {
-            assertEquals(values[i], random.nextDouble(), 1e-12);
+            Assertions.assertEquals(values[i], random.nextDouble(), 1e-12);
          }
       }
 

test/us/ihmc/realtime/concurrent/ConcurrentRingBufferTest.java → src/test/java/us/ihmc/realtime/concurrent/ConcurrentRingBufferTest.java

@@ -23,7 +23,7 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import us.ihmc.concurrent.Builder;
 import us.ihmc.concurrent.ConcurrentRingBuffer;
@@ -40,7 +40,7 @@ int get_random()
        return (m_z << 16) + m_w;  /* 32-bit result */
    }
 
-   @Test(timeout=300000)
+   @Test
    public void test() throws IOException
    {
       final long iterations = 100000000L;