Merge pull request #48 from boschglobal/feature-46

Test Deployment

.github/workflows/deploy-release.yaml

@@ -7,11 +7,9 @@ on:
     tags:
       - 'release/v*'
 
-permissions:
-  packages: write
-
 jobs:
   deployment:
+    if: github.repository == 'eclipse-kuksa/kuksa-android-sdk'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -29,7 +27,9 @@ jobs:
         run: ./gradlew setReleaseVersion # Do not chain this command because it writes into a file which needs to be re-read inside the next gradle command
 
       - name: Publish Library
-        run: ./gradlew publishReleasePublicationToGithubPackagesRepository
-          -Pgpr.repository=${{ github.repository }}
-          -Pgpr.user=${{ github.actor }}
-          -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
+        env:
+          ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
+          ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+          ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
+          ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
+        run: ./gradlew publishAllPublicationsToOSSRHReleaseRepository

.github/workflows/deploy-snapshot.yaml

@@ -6,12 +6,11 @@ on:
   push:
     branches:
       - main
-
-permissions:
-  packages: write
+      - testdeploy
 
 jobs:
   deployment:
+    if: github.repository == 'eclipse-kuksa/kuksa-android-sdk'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -32,7 +31,9 @@ jobs:
         run: ./gradlew setSnapshotVersion # Do not chain this command because it writes into a file which needs to be re-read inside the next gradle command
 
       - name: Publish Library
-        run: ./gradlew publishReleasePublicationToGithubPackagesRepository
-          -Pgpr.repository=${{ github.repository }}
-          -Pgpr.user=${{ github.actor }}
-          -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
+        env:
+          ORG_GPG_PASSPHRASE: ${{ secrets.ORG_GPG_PASSPHRASE }}
+          ORG_GPG_PRIVATE_KEY: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
+          ORG_OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
+          ORG_OSSRH_USERNAME: ${{ secrets.ORG_OSSRH_USERNAME }}
+        run: ./gradlew publishAllPublicationsToOSSRHSnapshotRepository

app/build.gradle.kts

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
 plugins {
     id("com.android.application")
     id("com.google.devtools.ksp")

app/src/main/kotlin/org/eclipse/kuksa/testapp/extension/compose/HeadlineView.kt

@@ -1,21 +1,19 @@
 /*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  *
- *  * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *  *
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *     http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  */
 

app/src/main/kotlin/org/eclipse/kuksa/testapp/extension/compose/OverflowMenuView.kt

@@ -1,21 +1,19 @@
 /*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  *
- *  * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *  *
- *  * Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  *     http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *  *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  */
 

app/src/main/res/drawable/baseline_upload_file_24.xml

@@ -1,3 +1,22 @@
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  -->
+
 <vector android:height="24dp" android:tint="#000000"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2023 Contributors to the Eclipse Foundation
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -14,6 +14,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
   -->
 
 <resources>

buildSrc/build.gradle.kts

@@ -1,4 +1,22 @@
-import org.gradle.kotlin.dsl.`kotlin-dsl`
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {

buildSrc/settings.gradle.kts

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
 dependencyResolutionManagement {
     repositories {
         gradlePluginPortal()

buildSrc/src/main/kotlin/detekt.gradle.kts

@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 import org.eclipse.kuksa.extension.lib

buildSrc/src/main/kotlin/ktlint.gradle.kts

@@ -1,7 +1,21 @@
-import org.gradle.kotlin.dsl.creating
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.named
-import org.gradle.kotlin.dsl.registering
+/*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 
 val ktlint by configurations.creating
 

buildSrc/src/main/kotlin/publish.gradle.kts

@@ -19,6 +19,7 @@
 
 plugins {
     `maven-publish`
+    signing
 }
 
 interface PublishPluginExtension {
@@ -32,14 +33,21 @@ afterEvaluate {
     publishing {
         repositories {
             maven {
-                name = "GithubPackages"
+                name = "OSSRHRelease"
 
-                val repository = project.findProperty("gpr.repository") as String? ?: System.getenv("GPR_REPOSITORY")
-                url = uri("https://maven.pkg.github.com/$repository")
+                url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+                credentials {
+                    username = System.getenv("ORG_OSSRH_USERNAME")
+                    password = System.getenv("ORG_OSSRH_PASSWORD")
+                }
+            }
+            maven {
+                name = "OSSRHSnapshot"
 
+                url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
                 credentials {
-                    username = project.findProperty("gpr.user") as String? ?: System.getenv("GPR_USERNAME")
-                    password = project.findProperty("gpr.token") as String? ?: System.getenv("GPR_TOKEN")
+                    username = System.getenv("ORG_OSSRH_USERNAME")
+                    password = System.getenv("ORG_OSSRH_PASSWORD")
                 }
             }
         }
@@ -49,4 +57,26 @@ afterEvaluate {
             }
         }
     }
+
+    signing {
+        val signingKey = System.getenv("ORG_GPG_PRIVATE_KEY")
+        val signingPassword = System.getenv("ORG_GPG_PASSPHRASE")
+        useInMemoryPgpKeys(signingKey, signingPassword)
+
+        useGpgCmd()
+        sign(publishing.publications)
+    }
+}
+
+gradle.taskGraph.whenReady {
+    tasks.withType(Sign::class) {
+        val publishToMavenLocalTask = allTasks.find { it.name.contains("publishToMavenLocal") }
+        val isPublishingToMavenLocal = publishToMavenLocalTask != null
+
+        if (isPublishingToMavenLocal) {
+            println(":${project.name}:$name - Signing is disabled (publishToMavenLocal)")
+        }
+
+        onlyIf { !isPublishingToMavenLocal } // disable signing when publishing to MavenLocal
+    }
 }