mikes-macos-developer-disk-cleanup 1.0.3 → 1.0.7

package/.conventional-changelog-config.json

@@ -0,0 +1,26 @@
+{
+  "options": {
+    "infile": "CHANGELOG.md",
+    "header": "# Changelog",
+    "preset": {
+      "name": "conventionalchangelog",
+      "types": [
+        { "type": "feat", "section": "Features" },
+        { "type": "feature", "section": "Features" },
+        { "type": "fix", "section": "Bug Fixes" },
+        { "type": "perf", "section": "Performance Improvements" },
+        { "type": "revert", "section": "Reverts" },
+        { "type": "docs", "section": "Documentation" },
+        { "type": "style", "section": "Styles" },
+        { "type": "chore", "section": "Miscellaneous Chores" },
+        { "type": "refactor", "section": "Code Refactoring" },
+        { "type": "test", "section": "Tests" },
+        { "type": "build", "section": "Build System" },
+        { "type": "ci", "section": "Continuous Integration" }
+      ]
+    },
+    "writerOpts": {
+      "groupBy": "type"
+    }
+  }
+}

package/.env

@@ -0,0 +1,8 @@
+#/-------------------[DOTENV_PUBLIC_KEY]--------------------/
+#/            public-key encryption for .env files          /
+#/       [how it works](https://dotenvx.com/encryption)     /
+#/----------------------------------------------------------/
+DOTENV_PUBLIC_KEY="036dc3b1c538f3b753f28504685c42364d6aa3fd3cdc0d544ffab9dbe9c8d2afef"
+
+# .env
+GITHUB_TOKEN="encrypted:BNnSFezPjmz67d7bbIftawwuKLB65j8o5QStETBFPmMqZMlWMk0V1qF1NkhYKFvMcnjsv/qIV+1gT/Dkt4IzGZu8bXGhJ6cBfpZJ/QP79YvYGvrn/4qCLj/QsBtsNZc2iCpDJvU7dAzey7gi+2qCCDkZpjv042tsZtTcviAK+JbF31UBqsYTjxSM2FcaXwlbGlQjx6ygDk5AXJbTtQpCa1iAjfeW7ma9MypeKGGfSUBkCDMW42MZmXJZ+TN/Dw=="

package/.husky/commit-msg

@@ -0,0 +1 @@
+npx --no -- commitlint --edit $1

package/.husky/pre-commit

@@ -0,0 +1 @@
+

package/.nvmrc

@@ -0,0 +1 @@
+20

package/.release-it.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://unpkg.com/release-it@17/schema/release-it.json",
+  "git": {
+    "commitMessage": "chore: release ${version}",
+    "requireCleanWorkingDir": false
+  },
+  "github": {
+    "release": true
+  },
+  "npm": {
+    "publish": false
+  },
+  "hooks": {
+    "after:bump": "npm run release-changelog ${version}"
+  }
+}

package/.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+    "conventionalCommits.scopes": [
+        "android-avd",
+        "android-build-folders",
+        "android-sdk",
+        "bun-cache",
+        "cocoapods",
+        "docker-files",
+        "gradle-shared",
+        "hints",
+        "homebrew-caches",
+        "library-caches",
+        "meteor-builds-and-packages",
+        "node-modules",
+        "npm-cache",
+        "ruby-gems",
+        "trash",
+        "xcode-artifacts",
+        "yarn-cache",
+        "infra"
+    ]
+}

package/CHANGELOG.md

@@ -0,0 +1,57 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## 1.0.7 - 2025-02-05
+
+[88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc)...[30f323d](30f323da067b92b69f912cea5ce85b90997cef44)
+
+### Bug Fixes
+
+- :recycle: try to detect brew location ([2aace79](2aace79ab5570049af7bfd87908cbfd4a5f9334f))
+- :bug: fix avdmanager path error ([9b28ba2](9b28ba2f4163454a5d36e48af93c3e51509a8b9c))
+
+### Documentation
+
+- :bookmark: fix changelog for previous version ([8792d75](8792d759de54c46be3cf3471a7ef3c18f937a41c))
+
+### Miscellaneous Tasks
+
+- :construction_worker: fix changelog generation ([30f323d](30f323da067b92b69f912cea5ce85b90997cef44))
+
+## 1.0.6 - 2024-12-09
+
+[462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a)...[88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc)
+
+### Miscellaneous Tasks
+
+- :hammer: add GITHUB_TOKEN ([4d14cbf](4d14cbfae18980d645d60f10a7feef9ce7650b06))
+- :arrow_up: update dependency to node >= 18 ([ca92511](ca925115cb3137e795d55769dfa7332cf38b89cf))
+- Release 1.0.6 ([88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc))
+
+## 1.0.5 - 2024-12-09
+
+[bc39b3e](bc39b3e006b19b68acd7deb3b30a8be93b50a52b)...[462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a)
+
+### Bug Fixes
+
+- :bug: fix issue with android sdkmanager path ([6bb0ba6](6bb0ba6fcca63f56f44808eff220eda86579ce85))
+
+### Features
+
+- Add commit linting and release-it ([12729bd](12729bd019abd9219e6cb3eeda040fc90e836228))
+
+### Miscellaneous Tasks
+
+- :hammer: add vscode conventional commit scopes ([84e7ca5](84e7ca516dccec2ea1a798859480fbd65e77b935))
+- :hammer: add vscode conventional commit scopes ([5979eed](5979eed216a65ef6faa733bf71d2a5f47ffb708b))
+- :hammer: add release-it config ([639b8bb](639b8bb2122be6c4d7a83267c516636458d1743c))
+- Release 1.0.5 ([462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a))
+
+## 1.0.4 - 2024-10-03
+
+[d44b8c0](d44b8c0a12b30f9b4d8f15f89a1ee80150d147cd)...[bc39b3e](bc39b3e006b19b68acd7deb3b30a8be93b50a52b)
+
+## 1.0.3 - 2024-10-03
+
+<!-- generated by git-cliff -->

package/README.md

@@ -42,7 +42,7 @@ Currently it searches for (and cleans) the following items:
 
 ## Version History
 
-- v1.0: Initial release
+- See [Changelog][Changelog]
 
 
 <!-- 
@@ -50,7 +50,7 @@ Currently it searches for (and cleans) the following items:
 --->
 
 <!-- LINKS -->
-
+[Changelog]:./CHANGELOG.md
 
 <!-- IMAGES -->
 

package/cliff.toml

@@ -0,0 +1,67 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[changelog]
+# template for the changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+{% if version %}\
+    ## {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## Unreleased
+{% endif %}\
+{% if previous %}\
+    {% if previous.commit_id and commit_id %}
+        [{{ previous.commit_id | truncate(length=7, end="") }}]({{ previous.commit_id }})...\
+            [{{ commit_id | truncate(length=7, end="") }}]({{ commit_id }})
+    {% endif %}\
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {{ commit.message | split(pat="\n") | first | upper_first | trim }} ([{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }}))\
+          {% for footer in commit.footers -%}
+            , {{ footer.token }}{{ footer.separator }}{{ footer.value }}\
+          {% endfor %}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# template for the changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+# remove the leading and trailing whitespace from the templates
+trim = true
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = false
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features" },
+    { message = "^fix", group = "Bug Fixes" },
+    { message = "^doc", group = "Documentation" },
+    { message = "^perf", group = "Performance" },
+    { message = "^refactor", group = "Refactor" },
+    { message = "^style", group = "Styling" },
+    { message = "^test", group = "Testing" },
+    { message = "^chore\\(deps.*\\)", skip = true },
+    { message = "^chore\\(pr\\)", skip = true },
+    { message = "^chore\\(pull\\)", skip = true },
+    { message = "^chore\\(release\\): prepare for", skip = true },
+    { message = "^chore|^ci", group = "Miscellaneous Tasks" },
+    { body = ".*security", group = "Security" },
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# sort the tags topologically
+topo_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"

package/commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

package/mikes-macos-disk-cleanup.sh

@@ -26,6 +26,7 @@
 # - Android SDK packages
 # - Android AVDs
 # - Homebrew caches
+# - CocoaPods
 
 # ==== CONFIGURATION DEFAULTS - change as needed ====
 CONFIGFILE="${HOME}/.config/mikes-macos-disk-cleanup.env" # you'll be prompted to create this if it doesn't exist
@@ -68,9 +69,16 @@ if [ ${INITIALISED:-0} -ne 1 ]; then
       fi
       printf "DEVELOPMENT_BASE_DIR=${DEVELOPMENT_BASE_DIR}\n" >${CONFIGFILE}
       echo "Configuration saved to ${CONFIGFILE}"
+      echo "NOTE: subsequent invocations will immediately commence deleting files!"
     else
       echo "Not saving configuration..."
     fi
+
+    read -p "Deleting is about to start! Proceed? [y/n]" SHOULD_PROCEED
+    if [ "${SHOULD_PROCEED}" != "y" ]; then
+      echo "Exiting..."
+      exit 1
+    fi
   fi
 
   echo "Using development base directory: ${DEVELOPMENT_BASE_DIR}"
@@ -120,6 +128,13 @@ INITIALSPACE=$(
 )
 echo "DISK USAGE BEFORE CLEANUP: ${INITIALSPACE}"
 
+# addHint function
+source "${DIR}/modules/hints.sh"
+
+# CocoaPods
+source "${DIR}/modules/cocoapods.sh"
+cocoapods
+
 # remove everything in ~/Library/Caches
 source "${DIR}/modules/library-caches.sh"
 libraryCaches
@@ -170,7 +185,20 @@ androidBuildFolders
 
 # Android SDKs
 source "${DIR}/modules/android-sdk.sh"
+set +e ; # don't exit on error
 androidSDK
+RETCODE=$?
+set -e; # exit on error
+
+if [ ${RETCODE} -ne 0 ]; then
+  if [ ${RETCODE} -eq 100 ]; then
+    echo "Android SDK packages already only have one version installed. Proceeding."
+  else
+    echo "!!! Failed to clean up Android SDKs !!!"
+    echo "    check the output above for more info"
+    exit ${RETCODE}
+  fi
+fi
 
 # Android AVDs
 source "${DIR}/modules/android-avd.sh"
@@ -190,8 +218,8 @@ FINALSPACE=$(
     }'
 )
 
-echo "=== FINISHED! ==="
+echo "============================== FINISHED! ================================="
 
-echo "DISK USAGE BEFORE CLEANUP: ${INITIALSPACE}"
-echo "DISK USAGE AFTER CLEANUP: ${FINALSPACE}"
+echo "BEFORE CLEANUP: ${INITIALSPACE}"
+echo "NOW: ${FINALSPACE}"
 echo "${HINTS_UPON_FINISH}"

package/modules/android-avd.sh

@@ -1,8 +1,9 @@
 androidAVD() {
     # Android Virtual Device Cleanup
-    command -v avdmanager >/dev/null 2>&1 && {
+    local AVDMANAGER=${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager
+    command -v ${AVDMANAGER} >/dev/null 2>&1 && {
         # get the full path from one of the AVDs
-        local FIRST_AVD_PATH=$(avdmanager list avd | grep  "Path:" | head -1 | tr -s " "| cut -f3 -d" ")
+        local FIRST_AVD_PATH=$(${AVDMANAGER} list avd | grep  "Path:" | head -1 | tr -s " "| cut -f3 -d" ")
 
         if [ -z "${FIRST_AVD_PATH}" ]; then
             echo "no avds found"
@@ -13,15 +14,15 @@ androidAVD() {
         local FIRST_AVD_PARENTPATH=$(dirname "${FIRST_AVD_PATH}")
         local AVDFOLDERSIZEBEFORE=$(du -hs "${FIRST_AVD_PARENTPATH}" | cut -f1)
         echo "=== removing avds from ${FIRST_AVD_PARENTPATH} (${AVDFOLDERSIZEBEFORE}) ==="
-        for AVD in $(avdmanager list avd -c); do
+        for AVD in $(${AVDMANAGER} list avd -c); do
             printf "    - deleting AVD %s ..."
-            avdmanager delete avd -n "${AVD}"
+            ${AVDMANAGER} delete avd -n "${AVD}"
             echo "done"
         done
         local AVDFOLDERSIZEAFTER=$(du -hs "${FIRST_AVD_PARENTPATH}" | cut -f1)
         echo "    AVD folder size before: ${AVDFOLDERSIZEBEFORE}; after: ${AVDFOLDERSIZEAFTER}"
     } || {
-        echo "'avdmanager' command not found"
+        echo "'${AVDMANAGER}' command not found"
         return 1
     }
 }

package/modules/android-sdk.sh

@@ -2,36 +2,45 @@ androidSDK() {
     local THISMODULEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
     # Android SDK Manager Cleanup
-    command -v sdkmanager >/dev/null 2>&1 && {
-
+    command -v ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager >/dev/null 2>&1 && {
+        local SDKMANAGER_COMMAND="${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager"
         local ANDROIDHOME_BEFORE=$(du -hs $ANDROID_HOME | cut -f1)
 
         echo "=== android sdkmanager cleanup ==="
         echo "  - BEFORE CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
 
+        # remove .downloadIntermediates folder if it exists
+        if [ -d "${ANDROID_HOME}/.downloadIntermediates" ]; then
+            echo "    - removing ${ANDROID_HOME}/.downloadIntermediates"
+            rm -rf "${ANDROID_HOME}/.downloadIntermediates"
+        fi
         # create temporary output file
         local OUTFILENAME=$(mktemp)
 
-        sdkmanager --list_installed --include_obsolete |
+        local SDKMANAGER_OUTPUT=$(${SDKMANAGER_COMMAND} --list_installed --include_obsolete)
+
+        echo "${SDKMANAGER_OUTPUT}" |
             awk -f "${THISMODULEDIR}/android-sdk.awk" -v outputFile="${OUTFILENAME}"
 
         if [ $? -ne 0 ]; then
-            echo "    WARNING: we couldn't parse the output of 'sdkmanager --list_installed --include_obsolete'"
-            echo "    (maybe there's just nothing to remove?)"
-            return 1
+            echo "    WARNING: we could not parse the output of 'sdkmanager --list_installed --include_obsolete'"
+            echo "    \(very likely there is just nothing to remove\)"
+            cat "${OUTFILENAME}"
+            return 100
         fi
 
         echo "    - packages to remove: "
         cat "${OUTFILENAME}" | sed 's/^/      - /'
 
         echo "    - uninstalling packages..."
-        sdkmanager --uninstall --package_file="${OUTFILENAME}"
+        ${SDKMANAGER_COMMAND} --uninstall --package_file="${OUTFILENAME}"
         local ANDROIDHOME_AFTER=$(du -hs $ANDROID_HOME | cut -f1)
 
-        echo "  - BEFORE CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
-        echo "  - AFTER CLEANUP: ${ANDROIDHOME_AFTER}"
+        echo "  - BEFORE ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
+        echo "  - AFTER ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_AFTER}"
+        addHint "- You may need to run android's SDK manager to restore the Android SDK versions you were using"
     } || {
-        echo "'sdkmanager' command not found"
+        echo "'${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager' command not found"
         return 1
     }
 }

package/modules/cocoapods.sh

@@ -0,0 +1,32 @@
+cocoapods() {
+    if [ -d ${HOME}/.cocoapods ]; then
+        # Pods folders
+        echo "=== clearing Pods folders ==="
+        pod cache clean --all
+        echo "  - looking for Pods folders in ${DEVELOPMENT_BASE_DIR}... "
+        local PODS_FOLDERS=$(
+            find -E "${DEVELOPMENT_BASE_DIR}" -type d \
+                -regex '^.*Pods$' \
+                -not -regex "${HOME}/\..*" \
+                -not -regex "^.*Pods.+"
+        )
+        echo "  - found Pods folders:"
+        IFS=$'\n' # make newlines the only separator
+        for PODS_FOLDER in ${PODS_FOLDERS}; do
+            echo "  - ${PODS_FOLDER}"
+        done
+        echo "  - running 'rm -rf ' in each of the above"
+        local PODS_WERE_REMOVED=0
+        for PODS_FOLDER in ${PODS_FOLDERS}; do
+            PODS_WERE_REMOVED=1
+            local PODS_FOLDER_SIZE=$(du -hs "${PODS_FOLDER}" | cut -f1)
+            printf "  - removing '${PODS_FOLDER}' (${PODS_FOLDER_SIZE}) ... "
+            rm -rf "${PODS_FOLDER}"
+            echo "done"
+        done
+        unset IFS
+        if [ ${PODS_WERE_REMOVED} -eq 1 ]; then
+            addHint "- You'll need to perform a 'pod install' (or npx pod-install) in each of your projects"
+        fi
+    fi
+}

package/modules/hints.sh

@@ -0,0 +1,9 @@
+addHint(){
+    local HINTLENGTH=${#HINTS_UPON_FINISH}
+    if [ ${HINTLENGTH} -gt 0 ]; then
+        # add a newline if there was a previous hint
+        HINTS_UPON_FINISH=$(printf "%s\n%s", "${HINTS_UPON_FINISH}", "${1}")
+    else
+        HINTS_UPON_FINISH="${1}"
+    fi
+}

package/modules/homebrew-caches.sh

@@ -1,11 +1,21 @@
 homebrewCaches(){
+    local BREW;
+    if [ -f /opt/homebrew/bin/brew]; then
+        # apple silicon
+        BREW=/opt/homebrew/bin/brew
+    elif [ -f /usr/local/bin/brew ]; then
+        # intel mac
+        BREW=/usr/local/bin/brew
+    else
+        BREW=/home/linuxbrew/.linuxbrew/bin/brew
+    fi
     # Homebrew Caches
-    command -v brew >/dev/null 2>&1 && {
+    command -v ${BREW} >/dev/null 2>&1 && {
         echo "=== cleaning up homebrew caches ==="
         local SIZEBEFORE=$(du -hs ${HOME}/Library/Caches/Homebrew | cut -f1)
         # set +e: don't exit on error (brew cleanup sometimes has permissions problems)
         set +e
-        brew cleanup --prune=all
+        ${BREW} cleanup --prune=all
         if [ $? -ne 0 ]; then
             echo "!!! failed to clean up homebrew caches !!!"
             echo "    check the output above for more info"
@@ -14,5 +24,8 @@ homebrewCaches(){
         set -e
         local SIZEAFTER=$(du -hs ${HOME}/Library/Caches/Homebrew | cut -f1)
         echo "    cache size before: ${SIZEBEFORE}; after: ${SIZEAFTER}"
+    } || {
+        echo "brew command not found"
+    	return 1;
     }
-}
+}

package/modules/node-modules.sh

@@ -13,13 +13,18 @@ nodeModules() {
     for NODE_MODULE_FOLDER in ${NODE_MODULE_FOLDERS}; do
         echo "  - ${NODE_MODULE_FOLDER}"
     done
+    local MODULESWERE_REMOVED=0
     echo "  - running 'rm -rf ' in each of the above"
     for NODE_MODULE_FOLDER in ${NODE_MODULE_FOLDERS}; do
+        MODULESWERE_REMOVED=1
         local NODE_MODULE_SIZE=$(du -hs "${NODE_MODULE_FOLDER}" | cut -f1)
         printf "  - removing '${NODE_MODULE_FOLDER}' (${NODE_MODULE_SIZE}) ... "
         rm -rf "${NODE_MODULE_FOLDER}"
         echo "done"
     done
     unset IFS
+    if [ ${MODULESWERE_REMOVED} -eq 1 ]; then
+        addHint "- You will need to reinstall node modules in each of your projects"
+    fi
 
 }

package/modules/ruby-gems.sh

@@ -40,5 +40,9 @@ rubyGems() {
         done
 
         unset IFS
+        rvm use
     }
+
+    addHint "- You might need to reinstall your ruby gems"
+    addHint "  - e.g. gem install cocoapods"
 }

package/modules/xcode-artifacts.sh

@@ -20,7 +20,7 @@ xcodeArtifacts() {
         # Xcode DeviceLogs
         if [ -d ${HOME}/Library/Developer/CoreSimulator/Caches ]; then
             local XCCACHESIZE=$(du -hs ${HOME}/Library/Developer/CoreSimulator/Caches | cut -f1)
-            echo "   removing Xcode Caches (${XCCACHESIZE})..."
+            echo "   removing Xcode CoreSimulator Caches (${XCCACHESIZE})..."
             rm -rf ${HOME}/Library/Developer/CoreSimulator/Caches
         fi
 
@@ -35,11 +35,11 @@ xcodeArtifacts() {
                     awk '{\
             r=$0;\
             gsub(/^[^[:space:]]+[[:space:]]+/,"",r);\
-            printf("- This command would recover %s:\n    rm -rf \"%s\"\n",$1, r);\
+            printf("- This command would recover an additional %s:\n    rm -rf \"%s\"\n",$1, r);\
           }'
             )
             echo "${DEVICESUPPORTCOMMAND}"
-            HINTS_UPON_FINISH=$(printf "${HINTS_UPON_FINISH}\n${DEVICESUPPORTCOMMAND}")
+            addHint "${DEVICESUPPORTCOMMAND}"
         fi
     fi # xcode
 }

package/package.json

@@ -1,17 +1,31 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
     "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "release-changelog": "git-cliff --unreleased --prepend CHANGELOG.md --tag ",
+    "release": "dotenvx run release-it -- -i -u",
+    "prepare": "husky"
   },
   "keywords": [],
   "author": "Mike Cunneen",
+  "readme": "README.md",
   "repository": {
     "url": "https://github.com/cunneen/mikes-macos-developer-disk-cleanup"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "@commitlint/cli": "^19.7.1",
+    "@commitlint/config-conventional": "^19.7.1",
+    "git-cliff": "^2.8.0",
+    "husky": "^9.1.7",
+    "release-it": "^18.1.2"
+  },
+  "engines": {
+    "node": ">=20"
+  }
 }