cleanup

Author: christianaye

README.md

@@ -174,7 +174,8 @@ spotlessChangelog { // all defaults
   remote 'origin'
   branch 'main'
   // default value is false, but if you set it to true, then it will
-  // disable ssh host key checking (.ssh/known_hosts)
+  // disable ssh host key checking (.ssh/known_hosts).
+  // Can also set by command line arg `-PsshDisableStrictHostKeyChecking`.
   sshDisableStrictHostKeyChecking false
 }
 

spotless-changelog-lib/src/main/java/com/diffplug/spotless/changelog/GitActions.java

@@ -73,7 +73,7 @@ public void checkCanPush() throws GitAPIException, IOException {
 			}
 			push(cfg.branch, RemoteRefUpdate.Status.UP_TO_DATE);
 		} catch (GitAPIException e) {
-			throw new IllegalArgumentException("You can set user/pass with any of these environment variables: " + envVars(), e);
+			throw new IllegalArgumentException("You can set user/pass with any of these environment variables: " + envVars() + ", or try -PsshDisableStrictHostKeyChecking on ssh remotes", e);
 		}
 	}
 

spotless-changelog-lib/src/main/java/com/diffplug/spotless/changelog/GitCfg.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 DiffPlug
+ * Copyright (C) 2019-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spotless-changelog-plugin-gradle/src/main/java/com/diffplug/spotless/changelog/gradle/ChangelogExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 DiffPlug
+ * Copyright (C) 2019-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public ChangelogExtension(Project project) {
 	/**
 	 * Parses the changelog and calculates the next version.  Once this
 	 * has been done, the user can't change the configuration at all.
-	 * Use {@link #assertNotCalculatedYet()} on every mutation to check for this. 
+	 * Use {@link #assertNotCalculatedYet()} on every mutation to check for this.
 	 */
 	ChangelogAndNext model() {
 		if (model == null) {
@@ -123,7 +123,7 @@ public void versionSchema(Class<? extends NextVersionFunction> functionClass) th
 	 * If any of these strings are found in the `## [Unreleased]` section, then the
 	 * next version will bump the `added` place in `breaking.added.fixed` (unless
 	 * overruled by `ifFoundBumpBreaking`).
-	 * 
+	 *
 	 * Default value is `['### Added']`
 	 */
 	public void ifFoundBumpAdded(List<String> toFind) {
@@ -139,7 +139,7 @@ public void ifFoundBumpAdded(String... toFind) {
 	/**
 	 * If any of these strings are found in the `## [Unreleased]` section, then the
 	 * next version will bump the `breaking` place in `breaking.added.fixed`.
-	 * 
+	 *
 	 * Default value is `['**BREAKING**']`.
 	 */
 	public void ifFoundBumpBreaking(List<String> toFind) {
@@ -163,7 +163,7 @@ public void forceNextVersion(String forceNextVersion) {
 	 * appended to the end, unless you add `-Prelease=true` to the gradle command line.
 	 * Essentially, it asks like a gun safety where all versions are nerfed to `-SNAPSHOT`,
 	 * until you allow a release by adding `-Prelease`.
-	 * 
+	 *
 	 * Enabling this mode should look like this in your buildscript: `appendDashSnapshotUnless_dashPrelease=true`
 	 */
 	public void setAppendDashSnapshotUnless_dashPrelease(boolean appendSnapshot) {
@@ -175,15 +175,12 @@ public void setAppendDashSnapshotUnless_dashPrelease(boolean appendSnapshot) {
 	/**
 	 * If you set this to true, then the ssh host key checking over ssh:// remotes will be disabled.
 	 * By default strict host key checking is enabled. Make sure that there is an entry
-	 * in the know_hosts file for given ssh remote.
-	 * You can add `-PsshDisableStrictHostKeyChecking=true` to the gradle command.
-	 * Note: this command line parameter overrides buildscript setting.
+	 * in know_hosts file for given ssh remote.
+	 * You can also add `-PsshDisableStrictHostKeyChecking` to the gradle command.
 	 * In your buildscript you can disable checking with `sshDisableStrictHostKeyChecking = true`
 	 */
 	public void setSshDisableStrictHostKeyChecking(boolean disableStrictHostKeyChecking) {
-		gitCfg.disableStrictHostKeyChecking = project.getRootProject().hasProperty("sshDisableStrictHostKeyChecking")
-				? Boolean.parseBoolean((String) project.getRootProject().property("sshDisableStrictHostKeyChecking"))
-		: disableStrictHostKeyChecking;
+		gitCfg.disableStrictHostKeyChecking = disableStrictHostKeyChecking;
 	}
 
 	// tag and push

spotless-changelog-plugin-gradle/src/main/java/com/diffplug/spotless/changelog/gradle/ChangelogPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 DiffPlug
+ * Copyright (C) 2019-2021 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public void apply(Project project) {
 
 		ChangelogExtension extension = project.getExtensions().create(ChangelogExtension.NAME, ChangelogExtension.class, project);
 		project.getTasks().register(PrintTask.NAME, PrintTask.class, extension);
+		extension.gitCfg.disableStrictHostKeyChecking = project.getRootProject().findProperty("sshDisableStrictHostKeyChecking") != null;
 
 		TaskProvider<CheckTask> check = project.getTasks().register(CheckTask.NAME, CheckTask.class, extension);
 		TaskProvider<BumpTask> bump = project.getTasks().register(BumpTask.NAME, BumpTask.class, extension);