Merge branch 'master' of https://github.com/DeepBlueRobotics/lib199 into sendables

Author: CoolSpy3

.github/workflows/javadoc.yml

@@ -0,0 +1,37 @@
+name: Deploy Javadoc
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-javadoc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Generate Javadoc
+      run: ./gradlew javadoc
+    - name: Build Artifact
+      uses: actions/upload-pages-artifact@v1.0.5
+      with:
+        path: ./build/docs/javadoc
+  deploy-javadoc:
+    needs: build-javadoc
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1.2.3

.wpilib/wpilib_preferences.json

@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2022",
+    "projectYear": "2023",
     "teamNumber": 199
 }

README.md

@@ -1,3 +1,3 @@
 # FRC Team 199 Library
 
-This projects builds `lib199.jar` which contains code that reuse across projects/years.
+This projects builds `lib199.jar` which contains code that reuse across projects/years. The javadocs can be found [here](https://deepbluerobotics.github.io/lib199/).

build.gradle

@@ -1,8 +1,6 @@
-import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO
-
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2022.4.1"
+    id "edu.wpi.first.GradleRIO" version "2023.1.1"
     id "maven-publish"
 }
 
@@ -94,7 +92,7 @@ publishing {
         gpr(MavenPublication) {
             groupId = 'org.carlmontrobotics'
             artifactId = 'lib199'
-            version = '1.0.2'
+            version = '2.0.0'
 
             from components.java
         }
@@ -105,3 +103,8 @@ publishing {
 deployArtifact.jarTask = jar
 wpi.java.configureExecutableTasks(jar)
 wpi.java.configureTestTasks(test)
+
+// Configure string concat to always inline compile
+tasks.withType(JavaCompile) {
+    options.compilerArgs.add '-XDstringConcat=inline'
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=permwrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=permwrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -4,7 +4,7 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        String frcYear = '2022'
+        String frcYear = '2023'
         File frcHome
         if (OperatingSystem.current().isWindows()) {
             String publicFolder = System.getenv('PUBLIC')

gradlew

@@ -39,46 +39,49 @@ public final class Mocks {
         // 4) Mock invocations are cleared -> throws NullPointerException
         Lib199Subsystem.registerPeriodic(() -> MOCKS.removeIf(CLEAR_INVOCATIONS_ON_REFERENCED_MOCK_IF_REFERNCE_NOT_CLEARED));
     }
-    
+
     /**
      * Attempts to create an instance of a class in which some or all of the classes methods are replaced with a mocked implementation
-     * @param T the class type which will be mocked
-     * @param U the class type which will be used to provide method implementations
+     * @param <T> the class type which will be mocked
+     * @param <U> the class type which will be used to provide method implementations
      * @param classToMock the class type which will be mocked
      * @param implClass the object to which to try to forward method calls
      * @param interfaces a list of interfaces which the mocked object should extend
      * @return an instance of <code>T</code> in which some or all of the classes methods are replaced with a mocked implementation from <code>U</code>
-     * @see #createMock(java.lang.Class, java.lang.Object, java.lang.Class...) 
+     * @see #createMock(Class, Object, boolean, Class...)
+     * @see #createMock(Class, Object, Answer, Class...)
      */
     public static <T, U> T createMock(Class<T> classToMock, U implClass, Class<?>... interfaces) {
         return createMock(classToMock, implClass, true, interfaces);
     }
-    
+
     /**
      * Attempts to create an instance of a class in which some or all of the classes methods are replaced with a mocked implementation
-     * @param T the class type which will be mocked
-     * @param U the class type which will be used to provide method implementations
+     * @param <T> the class type which will be mocked
+     * @param <U> the class type which will be used to provide method implementations
      * @param classToMock the class type which will be mocked
      * @param implClass the object to which to try to forward method calls
      * @param forwardUnknownCalls whether methods which are not overriden will call their real methods
      * @param interfaces a list of interfaces which the mocked object should extend
      * @return an instance of <code>T</code> in which some or all of the classes methods are replaced with a mocked implementation from <code>U</code>
-     * @see #createMock(java.lang.Class, java.lang.Object) 
+     * @see #createMock(Class, Object, Class...)
+     * @see #createMock(Class, Object, Answer, Class...)
      */
     public static <T, U> T createMock(Class<T> classToMock, U implClass, boolean forwardUnknownCalls, Class<?>... interfaces) {
         return createMock(classToMock, implClass, forwardUnknownCalls ? InvocationOnMock::callRealMethod : new ReturnsSmartNulls(), interfaces);
     }
-    
+
     /**
      * Attempts to create an instance of a class in which some or all of the classes methods are replaced with a mocked implementation
-     * @param T the class type which will be mocked
-     * @param U the class type which will be used to provide method implementations
+     * @param <T> the class type which will be mocked
+     * @param <U> the class type which will be used to provide method implementations
      * @param classToMock the class type which will be mocked
      * @param implClass the object to which to try to forward method calls
      * @param defaultAnswer The answer to use when no overriden implementation is found
      * @param interfaces a list of interfaces which the mocked object should extend
      * @return an instance of <code>T</code> in which some or all of the classes methods are replaced with a mocked implementation from <code>U</code>
-     * @see #createMock(java.lang.Class, java.lang.Object) 
+     * @see #createMock(Class, Object, Class...)
+     * @see #createMock(Class, Object, boolean, Class...)
      */
     public static <T, U> T createMock(Class<T> classToMock, U implClass, Answer<Object> defaultAnswer, Class<?>... interfaces) {
         HashMap<Method, InvokableMethod> methods = new HashMap<>();
@@ -104,7 +107,13 @@ public static <T, U> T createMock(Class<T> classToMock, U implClass, Answer<Obje
         T mock = mock(classToMock, settings);
         return mock;
     }
-    
+
+    /**
+     * Lists all of the methods available in the provided base class and interface classes
+     * @param base The base class to search
+     * @param interfaces Additional interface classes to search
+     * @return An array of all the detected methods
+     */
     public static Method[] listMethods(Class<?> base, Class<?>... interfaces) {
         ArrayList<Method> out = new ArrayList<>();
         out.addAll(Arrays.asList(base.getMethods()));
@@ -114,7 +123,7 @@ public static Method[] listMethods(Class<?> base, Class<?>... interfaces) {
 
     /**
      * A wrapper for the underlying Mockito method which automatically calls {@link Mockito#clearInvocations(Object...)} to prevent memory leaks
-     * 
+     *
      * @see Mockito#mock(Class)
      */
     public static <T> T mock(Class<T> classToMock) {
@@ -187,6 +196,6 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
 
     private static interface InvokableMethod {
         public Object invoke(Object object, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException;
-    } 
+    }
 
 }