Merge remote-tracking branch 'origin/gradle' into gradle

Author: elect86

.travis/ci.py

@@ -58,7 +58,7 @@ def package_conda():
 
     subprocess.check_call(['mv', 'dist/sciview', exe_name])
 
-package_conda()
+#package_conda()
 
 # Update sites
 print('')
@@ -84,8 +84,8 @@ def package_conda():
 ## - release
 
 # TODO: check branch == <pom-release-version>
-if ( not is_PR and travis_secure and release_properties_exists ) or \
-    ( '[SV_IJ_DEPLOY_PRIMARY]' in commit_message ):
-    print('Upload to SciView')
-    subprocess.check_call(['sh', 'sciview_deploy.sh'])
+# if ( not is_PR and travis_secure and release_properties_exists ) or \
+#     ( '[SV_IJ_DEPLOY_PRIMARY]' in commit_message ):
+#     print('Upload to SciView')
+#     subprocess.check_call(['sh', 'sciview_deploy.sh'])
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016 - 2020, SciView developers.
+Copyright (c) 2016 - 2021, SciView developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

pom.xml

@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>29.2.1</version>
+		<version>30.0.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>sc.iview</groupId>
 	<artifactId>sciview</artifactId>
-	<version>0.2.0-beta-9-SNAPSHOT</version>
+	<version>0.2.0-beta-10-SNAPSHOT</version>
 
 	<name>SciView</name>
 	<description>Scenery-backed 3D visualization package for ImageJ.</description>
@@ -104,6 +104,7 @@
 
 		<license.licenseName>bsd_2</license.licenseName>
 		<license.copyrightOwners>SciView developers.</license.copyrightOwners>
+		<license.excludes>**/com/intellij/**,**/gnu/newtrove/**</license.excludes>
 
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>deploy-to-scijava</releaseProfiles>
@@ -168,7 +169,7 @@
 		<dependency>
 			<groupId>com.formdev</groupId>
 			<artifactId>flatlaf</artifactId>
-			<version>0.38</version>
+			<version>1.1</version>
 		</dependency>
 
 		<!-- SciJava dependencies -->

populate_fiji.sh

@@ -138,6 +138,11 @@ chmod +x $FijiDirectory/ImageJ-win64
 rm $FijiDirectory/jars/miglayout-3.7.4-swing.jar
 install "com.miglayout:miglayout-swing:5.2" $FijiDirectory/jars
 
+# -- Fix imagej-mesh versions with jitpack version clashing (temporary)
+
+rm $FijiDirectory/jars/imagej-mesh-*
+install "net.imagej:imagej-mesh:0.8.1" $FijiDirectory/jars
+
 # -- Get the list of native libraries --
 
 # [NB] dependency:list emits G:A:P:C:V but dependency:copy needs G:A:V:P:C.

src/main/java/sc/iview/ActiveSciViewPreprocessor.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/sc/iview/DefaultSciViewService.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/sc/iview/SciViewService.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/sc/iview/Version.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/sc/iview/commands/demo/ResourceLoader.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

src/main/java/sc/iview/commands/demo/advanced/ShowSegmentationDemo.java

@@ -2,7 +2,7 @@
  * #%L
  * Scenery-backed 3D visualization package for ImageJ.
  * %%
- * Copyright (C) 2016 - 2020 SciView developers.
+ * Copyright (C) 2016 - 2021 SciView developers.
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: