.github/workflows/gradle.yml

@@ -15,14 +15,13 @@ jobs:
         java-version: [ 11, 18 ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java-version }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v1
         with:
-          distribution: 'zulu'
           java-version: ${{ matrix.java-version }}
 
       - name: Grant execute permission for gradlew
@@ -30,14 +29,23 @@ jobs:
 
       - name: Cache SonarCloud packages
         if: matrix.java-version == env.SONAR_JDK
-        uses: actions/cache@v3
+        uses: actions/cache@v1
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-${{ matrix.java-version }}-
+
       - name: Test with Gradle
-        uses: gradle/gradle-build-action@v2
         env:
           CI_NAME: "GitHub CI"
           ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
@@ -52,12 +60,17 @@ jobs:
           MASTODON_ACCESS_TOKEN: ${{ secrets.MASTODON_ACCESS_TOKEN }}
           MASTODON_HANDLE: ${{ secrets.MASTODON_HANDLE }}
           MASTODON_INSTANCE: ${{ secrets.MASTODON_INSTANCE }}
-        with:
-          arguments: build check --stacktrace
+
+        run: ./gradlew build check --stacktrace
 
       - name: SonarCloud
         if: success() && matrix.java-version == env.SONAR_JDK
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew sonar --info
+        run: ./gradlew sonar
+
+      - name: Cleanup Gradle Cache
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'com.github.ben-manes.versions' version '0.45.0'
+    id 'com.github.ben-manes.versions' version '0.44.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.22.0'
     id 'java'

src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt

@@ -74,10 +74,7 @@ class Addons(private val props: Properties) {
                     if (logger.isDebugEnabled) {
                         logger.debug("Module $name is disabled.")
                     }
-                    names.disabledModules.add(name)
                 }
-            } else {
-                names.disabledModules.add(name)
             }
         }
         return enabled
@@ -109,10 +106,7 @@ class Addons(private val props: Properties) {
                     if (logger.isDebugEnabled) {
                         logger.debug("Command $name is disabled.")
                     }
-                    names.disabledCommands.add(name)
                 }
-            } else {
-                names.disabledCommands.add(name)
             }
         }
         return enabled
@@ -174,16 +168,12 @@ class Addons(private val props: Properties) {
      */
     object Names {
         val modules: MutableList<String> = mutableListOf()
-        val disabledModules: MutableList<String> = mutableListOf()
         val commands: MutableList<String> = mutableListOf()
-        val disabledCommands: MutableList<String> = mutableListOf()
         val ops: MutableList<String> = mutableListOf()
 
         fun sort() {
             modules.sort()
-            disabledModules.sort()
             commands.sort()
-            disabledCommands.sort()
             ops.sort()
         }
     }

src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt

@@ -148,10 +148,6 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         event.sendMessage("The commands are:")
         event.sendList(addons.names.commands, 8, isBold = true, isIndent = true)
         if (event.isChannelOp(channel)) {
-            if (addons.names.disabledCommands.isNotEmpty()) {
-                event.sendMessage("The disabled commands are:")
-                event.sendList(addons.names.disabledCommands, 8, isBold = false, isIndent = true)
-            }
             event.sendMessage("The op commands are:")
             event.sendList(addons.names.ops, 8, isBold = true, isIndent = true)
         }
@@ -416,7 +412,7 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         addons.add(Ignore())
         addons.add(LinksManager())
         addons.add(Me())
-        addons.add(Modules(addons.names.modules, addons.names.disabledModules))
+        addons.add(Modules(addons.names.modules))
         addons.add(Msg())
         addons.add(Nick())
         addons.add(Posting())

src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt

@@ -36,9 +36,9 @@ import net.thauvin.erik.mobibot.Utils.isChannelOp
 import net.thauvin.erik.mobibot.Utils.sendList
 import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Modules(private val modules: List<String>, private val disabledModules: List<String>) : AbstractCommand() {
+class Modules(private val modules: List<String>) : AbstractCommand() {
     override val name = "modules"
-    override val help = listOf("To view a list of enabled/disabled modules:", helpFormat("%c $name"))
+    override val help = listOf("To view a list of enabled modules:", helpFormat("%c $name"))
     override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
@@ -51,10 +51,6 @@ class Modules(private val modules: List<String>, private val disabledModules: Li
                 event.respondPrivateMessage("The enabled modules are: ")
                 event.sendList(modules, 7, isIndent = true)
             }
-            if (disabledModules.isNotEmpty()) {
-                event.respondPrivateMessage("The disabled modules are: ")
-                event.sendList(disabledModules, 7, isIndent = true)
-            }
         } else {
             helpResponse(channel, args, event)
         }

version.properties

@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Jan 30 22:08:48 PST 2023
-version.buildmeta=986
+#Sat Jan 28 23:17:39 PST 2023
+version.buildmeta=983
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=rc
 version.project=mobibot
-version.semver=0.8.0-rc+986
+version.semver=0.8.0-rc+983