Bump actions, fix nullability, fix codestyle

usefulness · Jan 29, 2024 · 5307eab · 5307eab
1 parent 8c4e371
commit 5307eab
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 19 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -37,7 +37,7 @@ jobs:
 
       - uses: gradle/wrapper-validation-action@v1
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - run: ./gradlew assemble
 
@@ -96,7 +96,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
         continue-on-error: true
         with:
           build-root-directory: sample

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -38,7 +38,7 @@ jobs:
           java-version: 21
 
       - name: Assemble
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assemble -m
 
@@ -91,7 +91,7 @@ jobs:
           java-version: 21
 
       - name: Assemble
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assemble -m
 

diff --git a/.github/workflows/diffuse.yml b/.github/workflows/diffuse.yml
@@ -48,7 +48,7 @@ jobs:
           key: diffuse-${{ github.event.pull_request.base.sha }}-always-cache-miss
           restore-keys: diffuse-${{ github.event.pull_request.base.sha }}
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - run: ./gradlew assemble -PskipJarVersion
 

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -36,7 +36,7 @@ jobs:
           distribution: 'temurin'
           java-version: 21
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - name: Unwrap GPG key
         env:

diff --git a/.github/workflows/publish_snapshots.yml b/.github/workflows/publish_snapshots.yml
@@ -39,7 +39,7 @@ jobs:
           java-version: 21
 
       - name: Build app with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - run: ./gradlew assemble
 
@@ -71,7 +71,7 @@ jobs:
           distribution: 'temurin'
           java-version: 21
 
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v3
 
       - run: ./gradlew assemble -PskipJarVersion
 

diff --git a/sample/gradle/libs.versions.toml b/sample/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ maven-junit = "5.10.1"
 maven-junit4 = "4.13.2"
 maven-assertj = "3.25.2"
 activity-compose = "1.8.2"
-androidx-compose-compiler = "1.5.4"
+androidx-compose-compiler = "1.5.8"
 androidx-core = "1.12.0"
 androidx-test-ext-junit = "1.1.5"
 com-squareup-moshi = "1.15.0"

diff --git a/...tion/src/main/kotlin/io/github/usefulness/licensee/serialization/SerializationArtifact.kt b/...tion/src/main/kotlin/io/github/usefulness/licensee/serialization/SerializationArtifact.kt
@@ -14,8 +14,8 @@ data class Scm(val url: String)
 
 @Serializable
 data class UnknownLicenses(
-    val name: String,
-    val url: String,
+    val name: String?,
+    val url: String?,
 )
 
 @Serializable

diff --git a/sample/settings.gradle b/sample/settings.gradle
@@ -12,7 +12,7 @@ pluginManagement {
         }
         gradlePluginPortal {
             content {
-                excludeModule("io.github.usefulness", "lincensee-for-android")
+                excludeModule("io.github.usefulness", "licensee-for-android")
             }
         }
     }
@@ -33,7 +33,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral {
             content {
-                excludeModule("io.github.usefulness", "lincensee-for-android-core")
+                excludeModule("io.github.usefulness", "licensee-for-android-core")
             }
         }
     }

diff --git a/sample/ui/src/main/kotlin/se/premex/gross/ui/OssView.kt b/sample/ui/src/main/kotlin/se/premex/gross/ui/OssView.kt
@@ -113,8 +113,8 @@ private data class ViewArtifact(
 )
 
 private data class ViewLicense(
-    val title: String,
-    val url: String,
+    val title: String?,
+    val url: String?,
 )
 
 @Composable
@@ -158,17 +158,19 @@ private fun LicenseSelector(dialogData: LicensesDialogData, onDismissRequest: ()
                 dialogData.licenses.forEach { license ->
                     ListItem(
                         headlineContent = {
-                            Text(text = license.title)
+                            license.title?.let { Text(text = it) }
                         },
                         leadingContent = {
                             Icon(
                                 imageVector = Icons.Filled.Link,
                                 contentDescription = null,
                             )
                         },
-                        modifier = Modifier.clickable {
-                            uriHandler.openUri(license.url)
-                        },
+                        modifier = license.url?.let { url ->
+                            Modifier.clickable {
+                                uriHandler.openUri(url)
+                            }
+                        } ?: Modifier,
                     )
                 }
             }

diff --git a/...kotlin/se/premex/gross/ui/OssViewModel.kt → ...c/main/kotlin/se/premex/gross/ui/State.kt b/...kotlin/se/premex/gross/ui/OssViewModel.kt → ...c/main/kotlin/se/premex/gross/ui/State.kt