Merge pull request #153 from Yelp/nc/bump-deps

Author: cortinico

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
   - id: check-merge-conflict
   - id: trailing-whitespace
@@ -12,7 +12,7 @@ repos:
     exclude: ^samples/[^/]+/src/main/java/swagger.json$
   - id: check-yaml
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.0.0
+  rev: v2.1.0
   hooks:
   - id: pretty-format-java
     args: [--autofix]
@@ -22,7 +22,7 @@ repos:
     args: [--autofix, --indent, '2']
     exclude: ^config/detekt/detekt\.yml$
 - repo: https://github.com/Yelp/detect-secrets
-  rev: v0.14.3
+  rev: v1.1.0
   hooks:
   - id: detect-secrets
     args: [--baseline, .secrets.baseline]

.secrets.baseline

@@ -1,46 +1,68 @@
 {
-  "custom_plugin_paths": [],
-  "exclude": {
-    "files": null,
-    "lines": null
-  },
-  "generated_at": "2020-10-23T18:25:01Z",
+  "version": "1.1.0",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
     },
     {
-      "base64_limit": 4.5,
-      "name": "Base64HighEntropyString"
+      "name": "Base64HighEntropyString",
+      "limit": 4.5
     },
     {
       "name": "BasicAuthDetector"
     },
     {
-      "hex_limit": 3,
-      "name": "HexHighEntropyString"
+      "name": "HexHighEntropyString",
+      "limit": 3
     },
     {
-      "keyword_exclude": null,
-      "name": "KeywordDetector"
+      "name": "KeywordDetector",
+      "keyword_exclude": ""
     },
     {
       "name": "PrivateKeyDetector"
     }
   ],
-  "results": {
-    "gradle.properties.example": [
-      {
-        "hashed_secret": "6f9583b0d701174f6b64698f940f9e1470612638",
-        "is_verified": false,
-        "line_number": 2,
-        "type": "Secret Keyword"
-      }
-    ]
-  },
-  "version": "0.14.3",
-  "word_list": {
-    "file": null,
-    "hash": null
-  }
+  "filters_used": [
+    {
+      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_baseline_file",
+      "filename": ".secrets.baseline"
+    },
+    {
+      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+      "min_level": 2
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_lock_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_sequential_string"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_swagger_file"
+    },
+    {
+      "path": "detect_secrets.filters.heuristic.is_templated_secret"
+    }
+  ],
+  "results": {},
+  "generated_at": "2021-08-08T15:04:32Z"
 }

README.md

@@ -56,7 +56,7 @@ Once you setup the plugin correctly, you can call the `:generateSwagger` gradle
 
 In order to run this gradle plugin you need to fulfill the following requirements:
 
-* Gradle 5.x - This plugin uses Gradle 5 features, and you will need to setup your Gradle wrapper to use 5.4.1 or more.
+* Gradle 6.x - This plugin uses Gradle 6 features, and you will need to setup your Gradle wrapper to use 6.8 or more.
 * Java 8+
 
 ## Supported platforms

build.gradle.kts

@@ -4,7 +4,6 @@ subprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 }
 
@@ -55,10 +54,11 @@ val preMerge = tasks.register("preMerge") {
 }
 
 plugins {
-    id("com.android.library").version("4.0.1").apply(false)
+    id("com.android.library").version("4.2.2").apply(false)
     id("com.yelp.codegen.plugin").version("1.4.1").apply(false)
-    id("io.gitlab.arturbosch.detekt").version("1.14.2").apply(false)
-    kotlin("android").version("1.3.72").apply(false)
+    id("io.gitlab.arturbosch.detekt").version("1.17.1").apply(false)
+    id("com.github.ben-manes.versions") version "0.39.0"
+    kotlin("android").version("1.4.32").apply(false)
 }
 
 subprojects {
@@ -76,7 +76,7 @@ subprojects {
  * Python `venv/bin` folder is different based on OS.
  * On Windows it's inside the `venv/Scripts` folder.
  */
-val binFolder : String get() = if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+val binFolder: String get() = if (System.getProperty("os.name").toLowerCase().contains("windows")) {
     "Scripts"
 } else {
     "bin"