Skip to content

Commit f2f2dd3

Browse files
committed
fix(gradle): fix spotless & axion-release conflect with git
fix diffplug/spotless#643
1 parent c173059 commit f2f2dd3

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ bin/
1010
*.iml
1111
*.iws
1212
out/
13+
local.properties
1314

1415
# NetBeans
1516
nb-configuration.xml

docs/faq/grpc.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424

2525
Reference : [gRPC Authentication](https://grpc.io/docs/guides/auth/)
2626

27+
- Awesome gRPC videos
28+
29+
{% youtube src="https://www.youtube.com/watch?v=j1CzQNydMLI" %}{% endyoutube %}
30+
2731
### flow-control middleware
2832

2933
- How to implement gRPC client/server side resilience?

settings.gradle.kts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ pluginManagement {
55
mavenCentral()
66
gradlePluginPortal()
77
}
8+
9+
// FIXME: remove after: https://github.com/diffplug/spotless/issues/643
10+
buildscript {
11+
repositories {
12+
mavenLocal()
13+
mavenCentral()
14+
}
15+
dependencies {
16+
classpath("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
17+
}
18+
configurations.classpath {
19+
resolutionStrategy {
20+
force("org.eclipse.jgit:org.eclipse.jgit:5.7.0.202003110725-r")
21+
}
22+
}
23+
}
24+
825
plugins {
926
val sonarPluginVersion: String by settings
1027
val spotlessPluginVersion: String by settings

0 commit comments

Comments
 (0)