Merge pull request #90 from stytchauth/jordan/fix-rn-publishing

Various publishing fixes/tweaks

Author: jhaven-stytch

.github/workflows/docs.yml

@@ -167,13 +167,13 @@ jobs:
           xcrun docc convert source/ios/docs/StytchConsumerSDK.docc \
             --additional-symbol-graph-dir symbolgraphs/consumer-injected \
             --transform-for-static-hosting \
-            --hosting-base-path ios/consumer \
+            --hosting-base-path stytch-mobile/ios/consumer \
             --output-dir docs-output/ios/consumer
 
           xcrun docc convert source/ios/docs/StytchB2BSDK.docc \
             --additional-symbol-graph-dir symbolgraphs/b2b-injected \
             --transform-for-static-hosting \
-            --hosting-base-path ios/b2b \
+            --hosting-base-path stytch-mobile/ios/b2b \
             --output-dir docs-output/ios/b2b
 
       - name: Tar iOS docs (avoid colon-in-filename rejection by upload-artifact)

.github/workflows/publish.yml

@@ -295,22 +295,22 @@ jobs:
       - name: Build consumer JS output
         working-directory: source/sdks
         run: |
-          ./gradlew :sdk:consumer-headless:assemble :sdk:consumer-headless:jsBrowserProductionLibraryDistribution
+          ./gradlew :sdk:consumer-headless:jsBrowserProductionLibraryDistribution
           mkdir -p $GITHUB_WORKSPACE/source/react-native/consumer/lib
           cp -r sdk/consumer-headless/build/dist/js/productionLibrary/consumer-headless* $GITHUB_WORKSPACE/source/react-native/consumer/lib
 
       - name: Build B2B JS output
         working-directory: source/sdks
         run: |
-          ./gradlew :sdk:b2b-headless:assemble :sdk:b2b-headless:jsBrowserProductionLibraryDistribution
+          ./gradlew :sdk:b2b-headless:jsBrowserProductionLibraryDistribution
           mkdir -p $GITHUB_WORKSPACE/source/react-native/b2b/lib
           cp -r sdk/b2b-headless/build/dist/js/productionLibrary/b2b-headless* $GITHUB_WORKSPACE/source/react-native/b2b/lib
 
       - name: Stamp version into package.json files
         run: |
           VERSION=$(cat version.txt)
-          npm version "$VERSION" --no-git-tag-version --prefix source/react-native/consumer
-          npm version "$VERSION" --no-git-tag-version --prefix source/react-native/b2b
+          npm version "$VERSION" --no-git-tag-version --prefix source/react-native/consumer || true
+          npm version "$VERSION" --no-git-tag-version --prefix source/react-native/b2b || true
 
       - name: Install dependencies and build consumer RN package
         working-directory: source/react-native/consumer

README.md

@@ -366,6 +366,12 @@ Callback extensions are available on Android and JVM only. iOS uses native `asyn
 
 ---
 
+## Documentation
+
+Full API documentation is included (KDoc/JavaDoc, DocC, JSDoc) for in-editor reference, as well as hosted [here](https://stytchauth.github.io/stytch-mobile/).
+
+For deeper documentation, consult our [docs site](https://stytch.com/docs).
+
 ## Support
 
 If you have questions, found a bug or want help troubleshooting, join us in [Slack](https://stytch.com/docs/resources/support/overview) or email [support@stytch.com](mailto:support@stytch.com).

source/react-native/shared/StytchReactNative.podspec

@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 # If STYTCH_REPO_ROOT is set (local dev), use it as the path to the checked-out repo, otherwise fall back to github
 spmUrl = ENV['STYTCH_REPO_ROOT'] ? File.join(ENV['STYTCH_REPO_ROOT'], 'source', 'ios') : 'https://github.com/stytchauth/stytch-ios-sdk'
-
+spmRequirement = ENV['STYTCH_REPO_ROOT'] ? {} : {kind: 'upToNextMajorVersion', minimumVersion: package["version"]}
 Pod::Spec.new do |s|
   s.name         = "StytchReactNative"
   s.version      = package["version"]
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   spm_dependency(s,
     url: spmUrl,
-    requirement: {},
+    requirement: spmRequirement,
     products: ['StytchConsumerSDK'] # We're only using the shared module from this, so it doesn't matter if it's the consumer or b2b one :)
   )
 

source/react-native/shared/src/app.plugin.cjs

@@ -3,6 +3,8 @@
 const { withXcodeProject } = require('@expo/config-plugins');
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const path = require('path');
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const { version } = require('../package.json');
 
 // If STYTCH_REPO_ROOT is set (local dev), use it as the path to the checked-out repo.
 // Otherwise fall back to the live GitHub URL
@@ -24,7 +26,10 @@ const addSPMDependenciesToMainTarget = (config) =>
     const isLocal = !!process.env.STYTCH_REPO_ROOT;
     const refType = isLocal ? 'XCLocalSwiftPackageReference' : 'XCRemoteSwiftPackageReference';
     const refKey = isLocal ? 'relativePath' : 'repositoryURL';
-
+    const spmRequirement = isLocal ? {} : {
+          kind: 'upToNextMajorVersion',
+          minimumVersion: version,
+    };
     if (!xcodeProject.hash.project.objects[refType]) {
       xcodeProject.hash.project.objects[refType] = {};
     }
@@ -36,6 +41,7 @@ const addSPMDependenciesToMainTarget = (config) =>
     ] = {
       isa: refType,
       [refKey]: spmUrl,
+      requirement: spmRequirement,
     };
 
     // update XCSwiftPackageProductDependency

source/sdks/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.vanniktech.maven.publish.DeploymentValidation
+
 plugins {
     alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
@@ -30,7 +32,10 @@ subprojects {
         apply(plugin = "org.jetbrains.dokka")
         apply(plugin = "org.cyclonedx.bom")
         configure<com.vanniktech.maven.publish.MavenPublishBaseExtension> {
-            publishToMavenCentral()
+            publishToMavenCentral(
+                automaticRelease = true,
+                validateDeployment = DeploymentValidation.VALIDATED,
+            )
             configure(
                 com.vanniktech.maven.publish.KotlinMultiplatform(
                     com.vanniktech.maven.publish.JavadocJar

source/shared/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.vanniktech.maven.publish.DeploymentValidation
+
 plugins {
     alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
@@ -21,7 +23,10 @@ subprojects {
     plugins.withId("com.vanniktech.maven.publish") {
         apply(plugin = "org.cyclonedx.bom")
         configure<com.vanniktech.maven.publish.MavenPublishBaseExtension> {
-            publishToMavenCentral()
+            publishToMavenCentral(
+                automaticRelease = true,
+                validateDeployment = DeploymentValidation.VALIDATED,
+            )
             if (!System.getenv("ORG_GRADLE_PROJECT_signingInMemoryKey").isNullOrEmpty()) {
                 signAllPublications()
             }

version.txt

@@ -1 +1 @@
-1.0.0
+1.0.1