From 751d31529905fe3ee3ff3b8f29ac636ae6425b17 Mon Sep 17 00:00:00 2001 From: az Date: Wed, 20 Jul 2022 18:37:13 +0200 Subject: [PATCH] rename provisionBaseDesktop to provisionBasicDesktop --- build.gradle | 2 +- .../provs/desktop/domain/DesktopService.kt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 99d31ce..fd9f745 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: "kotlinx-serialization" group = "org.domaindrivenarchitecture.provs" -version = "release-0.15.1" +version = "release-0.15.2" repositories { mavenCentral() diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt index 16d2e7a..5852429 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt @@ -40,7 +40,7 @@ internal fun Prov.provisionDesktop( ) = task { validatePrecondition() - provisionBaseDesktop(gpg, ssh, gitUserName, gitEmail, submodules) + provisionBasicDesktop(gpg, ssh, gitUserName, gitEmail, submodules) if (desktopType == DesktopType.OFFICE || desktopType == DesktopType.IDE) { provisionOfficeDesktop(submodules) @@ -77,10 +77,11 @@ fun Prov.provisionIdeDesktop(submodules: List?) { } } +@Suppress("unused") fun Prov.provisionMSDesktop(submodules: List?) { if (submodules == null) { installMsTeams() - } else if (submodules?.contains(DesktopSubmodule.TEAMS.name.lowercase()) == true) { + } else if (submodules.contains(DesktopSubmodule.TEAMS.name.lowercase())) { installMsTeams() } } @@ -103,7 +104,7 @@ fun Prov.provisionOfficeDesktop(submodules: List?) { } } -fun Prov.provisionBaseDesktop( +fun Prov.provisionBasicDesktop( gpg: KeyPair?, ssh: KeyPair?, gitUserName: String?,