fix(gradle): fix spotless & axion-release conflect with git

fix diffplug/spotless#643
xmlking · Jul 14, 2020 · f2f2dd3 · f2f2dd3
1 parent c173059
commit f2f2dd3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ bin/
 *.iml
 *.iws
 out/
+local.properties
 
 # NetBeans
 nb-configuration.xml

diff --git a/docs/faq/grpc.md b/docs/faq/grpc.md
@@ -24,6 +24,10 @@
 
     Reference : [gRPC Authentication](https://grpc.io/docs/guides/auth/)
 
+- Awesome gRPC videos
+
+{% youtube src="https://www.youtube.com/watch?v=j1CzQNydMLI" %}{% endyoutube %}
+
 ### flow-control middleware 
 
 - How to implement gRPC client/server side resilience?

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -5,6 +5,23 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
+
+    // FIXME: remove after: https://github.com/diffplug/spotless/issues/643
+    buildscript {
+        repositories {
+            mavenLocal()
+            mavenCentral()
+        }
+        dependencies {
+            classpath("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
+        }
+        configurations.classpath {
+            resolutionStrategy {
+                force("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
+            }
+        }
+    }
+
     plugins {
         val sonarPluginVersion: String by settings
         val spotlessPluginVersion: String by settings