More credentials passing

Author: rossdanderson

.github/workflows/build.yml

@@ -59,6 +59,9 @@ jobs:
 
       - name: Run tests
         run: ./gradlew --continue check koverXmlReport
+        env:
+          CAPLIN_USERNAME: ${{ secrets.CAPLIN_USERNAME }}
+          CAPLIN_PASSWORD: ${{ secrets.CAPLIN_PASSWORD }}
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v5
@@ -103,6 +106,9 @@ jobs:
 
       - name: Generate documentation
         run: ./gradlew dokkaGenerate
+        env:
+          CAPLIN_USERNAME: ${{ secrets.CAPLIN_USERNAME }}
+          CAPLIN_PASSWORD: ${{ secrets.CAPLIN_PASSWORD }}
 
       - name: Upload documentation
         uses: actions/upload-artifact@v4
@@ -163,3 +169,5 @@ jobs:
         run: ./gradlew publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CAPLIN_USERNAME: ${{ secrets.CAPLIN_USERNAME }}
+          CAPLIN_PASSWORD: ${{ secrets.CAPLIN_PASSWORD }}

settings.gradle.kts

@@ -3,15 +3,15 @@ dependencyResolutionManagement {
     mavenCentral()
     maven {
       url = uri("https://repository.caplin.com/repository/caplin-release")
-      val caplinUsername: String? by settings
-      val caplinPassword: String? by settings
-      val username = caplinUsername ?: System.getenv("CAPLIN_USERNAME")
-      val password = caplinPassword ?: System.getenv("CAPLIN_PASSWORD")
-      if (username != null || password != null) {
-        credentials {
-          this.username = username
-          this.password = password
-        }
+      credentials {
+        val caplinUsername: String? by settings
+        val caplinPassword: String? by settings
+        username = checkNotNull(
+            caplinUsername ?: System.getenv("CAPLIN_USERNAME"),
+        ) { "Missing caplinUsername property or CAPLIN_USERNAME environment variable" }
+        password = checkNotNull(
+            caplinPassword ?: System.getenv("CAPLIN_PASSWORD"),
+        ) { "Missing caplinPassword property or CAPLIN_PASSWORD environment variable" }
       }
     }
   }