cleanup

Author: dorkbox

LICENSE

@@ -26,12 +26,12 @@ gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS_FULL   // always sh
 gradle.startParameter.warningMode = WarningMode.All
 
 plugins {
-    id("com.dorkbox.GradleUtils") version "1.12"
-    id("com.dorkbox.Licensing") version "2.5.4"
-    id("com.dorkbox.VersionUpdate") version "2.1"
-    id("com.dorkbox.GradlePublish") version "1.10"
+    id("com.dorkbox.GradleUtils") version "3.10"
+    id("com.dorkbox.Licensing") version "2.20"
+    id("com.dorkbox.VersionUpdate") version "2.6"
+    id("com.dorkbox.GradlePublish") version "1.17"
 
-    kotlin("jvm") version "1.4.21-2"
+    kotlin("jvm") version "1.8.0"
 }
 
 object Extras {
@@ -53,8 +53,7 @@ object Extras {
 /////  assign 'Extras'
 ///////////////////////////////
 GradleUtils.load("$projectDir/../../gradle.properties", Extras)
-GradleUtils.fixIntellijPaths()
-GradleUtils.defaultResolutionStrategy()
+GradleUtils.defaults()
 GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
 
 licensing {
@@ -72,39 +71,20 @@ licensing {
 
 sourceSets {
     main {
-        java {
-            setSrcDirs(listOf("src"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java")
-        }
-
         resources {
             setSrcDirs(listOf("resources"))
             include("*.png")
         }
     }
 
     test {
-        java {
-            setSrcDirs(listOf("test"))
-
-            // want to include java files for the source. 'setSrcDirs' resets includes...
-            include("**/*.java")
-        }
-
         resources {
             setSrcDirs(listOf("test"))
             include("*.png")
         }
     }
 }
 
-repositories {
-    mavenLocal() // this must be first!
-    jcenter()
-}
-
 ///////////////////////////////
 //////    Task defaults
 ///////////////////////////////
@@ -120,16 +100,14 @@ tasks.jar.get().apply {
         attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
         attributes["Implementation-Version"] = Extras.buildDate
         attributes["Implementation-Vendor"] = Extras.vendor
-
-        attributes["Automatic-Module-Name"] = Extras.id
     }
 }
 
 dependencies {
-    implementation("com.dorkbox:TweenEngine:8.3")
-    implementation("com.dorkbox:SwingActiveRender:1.1")
-    implementation("com.dorkbox:Utilities:1.9")
-    implementation("com.dorkbox:PropertyLoader:1.0")
+    implementation("com.dorkbox:TweenEngine:8.3.1")
+    implementation("com.dorkbox:SwingActiveRender:1.2")
+    implementation("com.dorkbox:Utilities:1.39")
+    implementation("com.dorkbox:PropertyLoader:1.1")
 }
 
 publishToSonatype {

README.md

@@ -32,12 +32,13 @@
 import dorkbox.tweenEngine.TweenEngine;
 import dorkbox.tweenEngine.TweenEquations;
 import dorkbox.util.ScreenUtil;
+import org.jetbrains.annotations.NotNull;
 
 @SuppressWarnings({"FieldCanBeLocal"})
 class LookAndFeel {
     private static final Map<String, PopupList> popups = new HashMap<String, PopupList>();
 
-    static final TweenEngine animation = TweenEngine.create()
+    static final TweenEngine animation = TweenEngine.Companion.create()
                                                     .unsafe()  // access is only from a single thread ever, so unsafe is preferred.
                                                     .build();
 
@@ -392,13 +393,12 @@ void addPopupToMap(final LookAndFeel sourceLook) {
                          .target(NotifyCanvas.WIDTH)
                          .ease(TweenEquations.Linear)
                          .addCallback(new TweenCallback() {
-                            @Override
-                            public
-                            void onEvent(final int type, final BaseTween<?> source) {
-                                if (type == Events.COMPLETE) {
-                                    sourceLook.notify.close();
-                                }
-                            }
+                             @Override
+                             public void onEvent(int type, BaseTween source) {
+                                 if (type == Events.COMPLETE) {
+                                     sourceLook.notify.close();
+                                 }
+                             }
                         })
                          .start();
             }
@@ -456,14 +456,14 @@ boolean removePopupFromMap(final LookAndFeel sourceLook) {
                     changedY = look.anchorY - (look.popupIndex * (NotifyCanvas.HEIGHT + SPACER) + offsetY);
                 }
 
-                // now animate that popup to it's new location
+                // now animate that popup to its new location
                 look.tween = animation.to(look, NotifyAccessor.Y_POS, accessor, MOVE_DURATION)
                                       .target((float) changedY)
                                       .ease(TweenEquations.Linear)
                                       .addCallback(new TweenCallback() {
                                           @Override
                                           public
-                                          void onEvent(final int type, final BaseTween<?> source) {
+                                          void onEvent(final int type, final BaseTween source) {
                                               if (type == Events.COMPLETE) {
                                                   // make sure to remove the tween once it's done, otherwise .kill can do weird things.
                                                   look.tween = null;

build.gradle.kts

@@ -37,7 +37,6 @@ class NotifyTest {
     void main(String[] args) {
         Notify notify;
 
-
         JFrame frame = new JFrame("Test");
 
         JPanel panel = new JPanel();