Update for 0.90 release. (#933)

This PR includes the following
- Removes multipaz-cbor-rpc-annotations library, move this code in multipaz
- Add publishing rules for multipaz-models and multipaz-compose
- Changes Maven group for multipaz-android-legacy to org.multipaz
- Fixes some bugs in publishing so Android artifacts are included when needed.
  This also resulted in some of the resource identifiers changing
- Cleans up / simplifies README.md file
- Adds a CHANGELOG.md file

This was testing by releasing to Maven Local and testing against
standalone projects consuming the artifacts.

Test: Manually tested, see above.
Test: ./gradlew check && ./gradlew connectedCheck

Signed-off-by: David Zeuthen <zeuthen@google.com>

Author: davidz25

CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.90] - 2025-03-26
+This is the first release with the CHANGELOG.md file and also the first release using the new
+Multipaz name. Main changes since the Identity Credential version 202411.1 include:
+- The project has been renamed to Multipaz and all package names have been
+  changed from `com.android.identity` to `org.multipaz`.
+- New `multipaz-models` and `multipaz-compose` libraries
+- Removal of `appholder` module.
+- Conversion of DocumentStore, Document, Credential to use suspend methods.
+- Conversion of SecureArea to use suspend methods.
+- Introduction of new PromptModel to handle interaction with the user for
+  asynchronous methods on SecureArea and NFC tag reading.
+- New multiplatform ASN.1 and X.509 code.
+- New multiplatform ISO/IEC 18013-5 proximity presentment stack.
+- New multiplatform NFC stack and NFC tag reader abstraction.
+- New multiplatform storage backend.
+- New presentment model and composable.
+- New HTML/Markdown, Notifications, LockScreen multiplatform composables.

CONTRIBUTING.md

@@ -17,8 +17,8 @@ here are some pointers about what we're looking for:
 - The commit message should be short, to the point, and explain exactly what the change is
   doing. Not too short, not too long. See the git history for inspiration and what the
   project is generally doing.
-- The code in the change should follow the style in CODING-STYLE.md.
-- The code must be tested, either with unit tests or manual tests. See TESTING.md for details.
+- The code in the change should follow the style in [CODING-STYLE.md](CODING-STYLE.md).
+- The code must be tested, either with unit tests or manual tests. See [TESTING.md](TESTING.md) for details.
 - We generally use a single commit per PR, to keep the git history sane.
 
 Before uploading a PR, it's generally a good idea to manually review the commit (using

README.md

@@ -57,7 +57,7 @@ dependencies {
     androidTestImplementation(libs.kotlinx.coroutines.core)
 }
 
-group = "com.android.identity"
+group = "org.multipaz"
 version = projectVersionName
 
 publishing {

multipaz-android-legacy/build.gradle.kts

@@ -1,8 +1,12 @@
 plugins {
     id("java-library")
     id("org.jetbrains.kotlin.jvm")
+    id("maven-publish")
 }
 
+val projectVersionCode: Int by rootProject.extra
+val projectVersionName: String by rootProject.extra
+
 kotlin {
     jvmToolchain(17)
 }
@@ -18,3 +22,24 @@ dependencies {
 
     testImplementation(libs.junit)
 }
+
+group = "org.multipaz"
+version = projectVersionName
+
+publishing {
+    repositories {
+        maven {
+            url = uri("${rootProject.rootDir}/repo")
+        }
+    }
+    publications.withType(MavenPublication::class) {
+        pom {
+            licenses {
+                license {
+                    name = "Apache 2.0"
+                    url = "https://opensource.org/licenses/Apache-2.0"
+                }
+            }
+        }
+    }
+}

multipaz-cbor-rpc-annotations/build.gradle.kts

@@ -8,8 +8,12 @@ plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
     alias(libs.plugins.compose.compiler)
+    id("maven-publish")
 }
 
+val projectVersionCode: Int by rootProject.extra
+val projectVersionName: String by rootProject.extra
+
 kotlin {
     jvmToolchain(17)
 
@@ -21,6 +25,8 @@ kotlin {
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
+
+        publishLibraryVariants("release")
     }
 
     listOf(
@@ -107,4 +113,33 @@ android {
             excludes += listOf("/META-INF/versions/9/OSGI-INF/MANIFEST.MF")
         }
     }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+group = "org.multipaz"
+version = projectVersionName
+
+publishing {
+    repositories {
+        maven {
+            url = uri("${rootProject.rootDir}/repo")
+        }
+    }
+    publications.withType(MavenPublication::class) {
+        pom {
+            licenses {
+                license {
+                    name = "Apache 2.0"
+                    url = "https://opensource.org/licenses/Apache-2.0"
+                }
+            }
+        }
+    }
 }
+
+tasks.named("generateResourceAccessorsForAndroidMain").configure { dependsOn("sourceReleaseJar") }

multipaz-cbor-rpc/build.gradle.kts

@@ -22,7 +22,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import org.multipaz.util.Logger
-import multipazproject.multipaz_compose.generated.resources.Res
+import org.multipaz.multipaz_compose.generated.resources.Res
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

multipaz-compose/build.gradle.kts

@@ -41,34 +41,34 @@ import org.multipaz.crypto.X500Name
 import org.multipaz.crypto.X509Cert
 import org.multipaz.crypto.X509CertChain
 import org.multipaz.datetime.FormatStyle
-import multipazproject.multipaz_compose.generated.resources.Res
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_critical_ext
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_common_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_country_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_locality_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_org_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_org_unit_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_other_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_pk_algorithm
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_pk_named_curve
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_pk_value
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_serial_number
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_state_name
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_type
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_valid_from
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_k_valid_until
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_non_critical_ext
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_oid
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_sub_basic_info
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_sub_extensions
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_sub_issuer
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_sub_public_key_info
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_sub_subject
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_valid_now
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_validity_in_the_future
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_validity_in_the_past
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_value
-import multipazproject.multipaz_compose.generated.resources.certificate_viewer_version_text
+import org.multipaz.multipaz_compose.generated.resources.Res
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_critical_ext
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_common_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_country_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_locality_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_org_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_org_unit_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_other_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_pk_algorithm
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_pk_named_curve
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_pk_value
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_serial_number
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_state_name
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_type
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_valid_from
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_k_valid_until
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_non_critical_ext
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_oid
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_sub_basic_info
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_sub_extensions
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_sub_issuer
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_sub_public_key_info
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_sub_subject
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_valid_now
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_validity_in_the_future
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_validity_in_the_past
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_value
+import org.multipaz.multipaz_compose.generated.resources.certificate_viewer_version_text
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import org.jetbrains.compose.resources.StringResource

multipaz-compose/src/androidMain/kotlin/org/multipaz/compose/webview/WebViewRender.android.kt

@@ -47,22 +47,22 @@ import org.multipaz.request.MdocRequestedClaim
 import org.multipaz.request.Request
 import org.multipaz.request.RequestedClaim
 import org.multipaz.trustmanagement.TrustPoint
-import multipazproject.multipaz_compose.generated.resources.Res
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_cancel
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_more
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_share
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_card_art_description
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_data_element_icon_description
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_headline_share_with_known_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_headline_share_with_unknown_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_and_stored_by_known_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_and_stored_by_unknown_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_with_known_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_with_unknown_requester
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_verifier_icon_description
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_wallet_privacy_policy
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_warning_icon_description
-import multipazproject.multipaz_compose.generated.resources.consent_modal_bottom_sheet_warning_verifier_not_in_trust_list
+import org.multipaz.multipaz_compose.generated.resources.Res
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_cancel
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_more
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_button_share
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_card_art_description
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_data_element_icon_description
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_headline_share_with_known_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_headline_share_with_unknown_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_and_stored_by_known_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_and_stored_by_unknown_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_with_known_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_share_with_unknown_requester
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_verifier_icon_description
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_wallet_privacy_policy
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_warning_icon_description
+import org.multipaz.multipaz_compose.generated.resources.consent_modal_bottom_sheet_warning_verifier_not_in_trust_list
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.ExperimentalResourceApi

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/certificateviewer/CertificateViewer.kt

@@ -5,23 +5,23 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import multipazproject.multipaz_compose.generated.resources.Res
-import multipazproject.multipaz_compose.generated.resources.duration_day
-import multipazproject.multipaz_compose.generated.resources.duration_days_and_hours
-import multipazproject.multipaz_compose.generated.resources.duration_hour
-import multipazproject.multipaz_compose.generated.resources.duration_hours_and_minutes
-import multipazproject.multipaz_compose.generated.resources.duration_in_a_few_moments
-import multipazproject.multipaz_compose.generated.resources.duration_just_now
-import multipazproject.multipaz_compose.generated.resources.duration_less_than_a_minute
-import multipazproject.multipaz_compose.generated.resources.duration_minute
-import multipazproject.multipaz_compose.generated.resources.duration_month
-import multipazproject.multipaz_compose.generated.resources.duration_months_and_days
-import multipazproject.multipaz_compose.generated.resources.duration_time_ago
-import multipazproject.multipaz_compose.generated.resources.duration_time_from_now
-import multipazproject.multipaz_compose.generated.resources.duration_week
-import multipazproject.multipaz_compose.generated.resources.duration_weeks_and_days
-import multipazproject.multipaz_compose.generated.resources.duration_year
-import multipazproject.multipaz_compose.generated.resources.duration_years_and_months
+import org.multipaz.multipaz_compose.generated.resources.Res
+import org.multipaz.multipaz_compose.generated.resources.duration_day
+import org.multipaz.multipaz_compose.generated.resources.duration_days_and_hours
+import org.multipaz.multipaz_compose.generated.resources.duration_hour
+import org.multipaz.multipaz_compose.generated.resources.duration_hours_and_minutes
+import org.multipaz.multipaz_compose.generated.resources.duration_in_a_few_moments
+import org.multipaz.multipaz_compose.generated.resources.duration_just_now
+import org.multipaz.multipaz_compose.generated.resources.duration_less_than_a_minute
+import org.multipaz.multipaz_compose.generated.resources.duration_minute
+import org.multipaz.multipaz_compose.generated.resources.duration_month
+import org.multipaz.multipaz_compose.generated.resources.duration_months_and_days
+import org.multipaz.multipaz_compose.generated.resources.duration_time_ago
+import org.multipaz.multipaz_compose.generated.resources.duration_time_from_now
+import org.multipaz.multipaz_compose.generated.resources.duration_week
+import org.multipaz.multipaz_compose.generated.resources.duration_weeks_and_days
+import org.multipaz.multipaz_compose.generated.resources.duration_year
+import org.multipaz.multipaz_compose.generated.resources.duration_years_and_months
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -31,7 +31,7 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.monthsUntil
 import kotlinx.datetime.plus
 import kotlinx.datetime.yearsUntil
-import multipazproject.multipaz_compose.generated.resources.duration_never
+import org.multipaz.multipaz_compose.generated.resources.duration_never
 import org.jetbrains.compose.resources.PluralStringResource
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.pluralStringResource

multipaz-compose/src/commonMain/kotlin/org/multipaz/compose/consent/ConsentModalBottomSheet.kt

@@ -35,9 +35,9 @@ import androidx.compose.ui.text.input.TransformedText
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.multipaz.securearea.PassphraseConstraints
-import multipazproject.multipaz_compose.generated.resources.Res
-import multipazproject.multipaz_compose.generated.resources.passphrase_entry_field_passphrase_is_weak
-import multipazproject.multipaz_compose.generated.resources.passphrase_entry_field_pin_is_weak
+import org.multipaz.multipaz_compose.generated.resources.Res
+import org.multipaz.multipaz_compose.generated.resources.passphrase_entry_field_passphrase_is_weak
+import org.multipaz.multipaz_compose.generated.resources.passphrase_entry_field_pin_is_weak
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking