(WIP) RELEASE 10

.github/workflows/release.yml → .github/workflows/build-and-upload-release-apks-to-server.yml

@@ -1,6 +1,6 @@
 on:
   workflow_dispatch:
-name: Build signed release APK
+name: Build signed release APK and upload to the server
 jobs:
   setup-android:
     runs-on: ubuntu-latest
@@ -50,6 +50,7 @@ jobs:
           python3 tools/generate.py --platform android
           cd ..
           sudo gem install license_finder
+          license_finder ignored_dependencies add skiko --why "Excluded due to native binary license concerns"
           license_finder inherited_decisions add open/decisions.yml
           license_finder --gradle-command="./gradlew \
           -Pcom.anytype.ci=true \
@@ -59,7 +60,7 @@ jobs:
         run: ./scripts/release/apk.sh
 
       - name: Build release APKS
-        run: ./gradlew :app:assembleRelease
+        run: ./gradlew :app:assembleRelease -PenableAbiSplits=true
 
       - name: Clean secrets
         if: always()

.github/workflows/build-github-release-with-apks.yml

@@ -0,0 +1,81 @@
+name: Create Github release with the attached APKS
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Git tag for the release (e.g. v1.0.0)'
+        required: true
+        type: string
+      release_name:
+        description: 'Release title (optional)'
+        required: false
+        default: ''
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    name: Build and Upload to GitHub Release
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Grant Gradle permission
+        run: chmod +x ./gradlew
+
+      - name: Setup middleware
+        env:
+          token_secret: ${{ secrets.ANYTYPE_SECRET }}
+          user_secret: ${{ secrets.ANYTYPE_USER_SECRET }}
+          amplitude_secret: ${{ secrets.ANYTYPE_AMPLITUDE_SECRET }}
+          amplitude_secret_debug: ${{ secrets.ANYTYPE_AMPLITUDE_DEBUG_SECRET }}
+          sentry_dsn_secret: ${{ secrets.ANYTYPE_SENTRY_DSN_SECRET }}
+        run: ./middleware2.sh $token_secret $user_secret $amplitude_secret $amplitude_secret_debug $sentry_dsn_secret
+
+      - name: Decrypt secrets
+        run: ./scripts/release/decrypt-secrets.sh
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+
+      - name: Setup keystore
+        env:
+          RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+          RELEASE_KEY_PWD: ${{ secrets.RELEASE_KEY_PWD }}
+          RELEASE_STORE_PWD: ${{ secrets.RELEASE_STORE_PWD }}
+        run: ./scripts/release/setup-store.sh $token_secret $RELEASE_KEY_ALIAS $RELEASE_KEY_PWD $RELEASE_STORE_PWD
+
+      - name: Prepare Android Manifest for APKs
+        run: ./scripts/release/apk.sh
+
+      - name: Build release APKs
+        run: ./gradlew :app:assembleRelease -PenableAbiSplits=true
+
+      - name: Prepare artefacts
+        run: ./scripts/release/prepare-release-artefacts.sh
+
+      - name: List prepared files
+        run: ls -lh app/build/outputs/apk/release/release-artefacts/
+
+      - name: Create and Upload GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.event.inputs.tag_name }}
+          name: ${{ github.event.inputs.release_name }}
+          files: app/build/outputs/apk/release/release-artefacts/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Clean secrets
+        if: always()
+        run: ./scripts/release/clean-secrets.sh

.github/workflows/build-release-apks-as-github-actions-artefacts.yml

@@ -0,0 +1,92 @@
+name: Build release APKs and upload it as Github Actions artefacts
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Git tag to build from'
+        required: true
+        type: string
+
+jobs:
+  build-release:
+    name: Build APK from tag
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo at tag
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # needed to fetch all tags
+          ref: ${{ github.event.inputs.tag }}
+
+      - name: Set up Android NDK
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
+
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+
+      - name: Setup middleware dependency
+        env:
+          token_secret: ${{ secrets.ANYTYPE_SECRET }}
+          user_secret: ${{ secrets.ANYTYPE_USER_SECRET }}
+          amplitude_secret: ${{ secrets.ANYTYPE_AMPLITUDE_SECRET }}
+          amplitude_secret_debug: ${{ secrets.ANYTYPE_AMPLITUDE_DEBUG_SECRET }}
+          sentry_dsn_secret: ${{ secrets.ANYTYPE_SENTRY_DSN_SECRET }}
+        run: ./middleware2.sh $token_secret $user_secret $amplitude_secret $amplitude_secret_debug $sentry_dsn_secret
+
+      - name: Decrypt secrets
+        run: ./scripts/release/decrypt-secrets.sh
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+
+      - name: Setup keystore
+        env:
+          RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+          RELEASE_KEY_PWD: ${{ secrets.RELEASE_KEY_PWD }}
+          RELEASE_STORE_PWD: ${{ secrets.RELEASE_STORE_PWD }}
+        run: ./scripts/release/setup-store.sh $token_secret $RELEASE_KEY_ALIAS $RELEASE_KEY_PWD $RELEASE_STORE_PWD
+
+      - name: Checkout license repository
+        uses: actions/checkout@v3
+        with:
+          repository: anyproto/open
+          ref: refs/heads/main
+          path: ./open
+
+      - name: Check licenses
+        run: |
+          cd open
+          python3 tools/generate.py --platform android
+          cd ..
+          sudo gem install license_finder
+          license_finder ignored_dependencies add skiko --why "Excluded due to native binary license concerns"
+          license_finder inherited_decisions add open/decisions.yml
+          license_finder --gradle-command="./gradlew \
+          -Pcom.anytype.ci=true \
+          -Dorg.gradle.unsafe.configuration-cache=false"
+
+      - name: Prepare Android Manifest
+        run: ./scripts/release/apk.sh
+
+      - name: Build release APKs
+        run: ./gradlew :app:assembleRelease -PenableAbiSplits=true
+
+      - name: Clean secrets
+        if: always()
+        run: ./scripts/release/clean-secrets.sh
+
+      - name: Prepare artefacts
+        run: ./scripts/release/prepare-release-artefacts.sh
+
+      - name: Upload artefacts as GitHub Actions output
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-apks-${{ github.event.inputs.tag }}
+          path: app/build/outputs/apk/release/release-artefacts/

analytics/src/main/java/com/anytypeio/anytype/analytics/base/EventsDictionary.kt

@@ -25,6 +25,7 @@ object EventsDictionary {
     const val clickDeleteSpaceWarning = "ClickDeleteSpaceWarning"
     const val createSpace = "CreateSpace"
     const val switchSpace = "SwitchSpace"
+    const val reorderSpace = "ReorderSpace"
     const val deleteSpace = "DeleteSpace"
     const val screenSettingsSpaceCreate = "ScreenSettingsSpaceCreate"
 
@@ -165,18 +166,22 @@ object EventsDictionary {
     const val editTemplate = "EditTemplate"
     const val duplicateTemplate = "DuplicateTemplate"
     const val createTemplate = "CreateTemplate"
+    const val logScreenTemplateSelector = "ScreenTemplateSelector"
 
     // Onboarding events
     const val screenOnboarding = "ScreenOnboarding"
     const val clickOnboarding = "ClickOnboarding"
     const val clickLogin = "ClickLogin"
+    const val screenOnboardingEnterEmail = "ScreenOnboardingEnterEmail"
+    const val screenOnboardingSkipEmail = "ScreenOnboardingSkipEmail"
 
     //Primitives
     const val logScreenEditType = "ScreenEditType"
     const val logReorderRelation = "ReorderRelation"
     const val logClickConflictFieldHelp = "ClickConflictFieldHelp"
     const val logAddConflictRelation = "AddConflictRelation"
     const val logResetToTypeDefault = "ResetToTypeDefault"
+    const val logScreenTypeTemplateSelector = "ScreenTypeTemplateSelector"
 
     // Vault events
 
@@ -295,7 +300,8 @@ object EventsDictionary {
     enum class ScreenOnboardingStep(val value: String) {
         VAULT("Vault"),
         SOUL("Soul"),
-        PHRASE("Phrase")
+        PHRASE("Phrase"),
+        EMAIL("Email")
     }
 
     enum class ClickOnboardingButton(val value: String) {

app/build.gradle

@@ -142,7 +142,7 @@ android {
         // Configures multiple APKs based on ABI.
         abi {
             // Enables building multiple APKs per ABI.
-            enable true
+            enable project.hasProperty("enableAbiSplits") && project.getProperty("enableAbiSplits").toBoolean()
             reset()
             include "armeabi-v7a", "arm64-v8a"
             universalApk true

app/gradle.properties

@@ -1,4 +1,4 @@
 version.versionMajor=0
 version.versionMinor=37
-version.versionPatch=10
+version.versionPatch=24
 version.useDatedVersionName=false

app/src/main/AndroidManifest.xml

@@ -53,7 +53,7 @@
                 <data android:scheme="http"/>
                 <data android:host="invite.any.coop" />
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />

app/src/main/java/com/anytypeio/anytype/di/feature/onboarding/signup/OnboardingMnemonicDI.kt

@@ -6,6 +6,8 @@ import com.anytypeio.anytype.di.common.ComponentDependencies
 import com.anytypeio.anytype.domain.auth.interactor.GetMnemonic
 import com.anytypeio.anytype.domain.auth.repo.AuthRepository
 import com.anytypeio.anytype.domain.config.ConfigStorage
+import com.anytypeio.anytype.domain.device.NetworkConnectionStatus
+import com.anytypeio.anytype.domain.network.NetworkModeProvider
 import com.anytypeio.anytype.presentation.onboarding.signup.OnboardingMnemonicViewModel
 import dagger.Binds
 import dagger.Component
@@ -57,6 +59,8 @@ interface OnboardingMnemonicDependencies : ComponentDependencies {
     fun authRepository(): AuthRepository
     fun analytics(): Analytics
     fun config(): ConfigStorage
+    fun networkModeProvider(): NetworkModeProvider
+    fun networkConnectionStatus(): NetworkConnectionStatus
 }
 
 @Scope

app/src/main/java/com/anytypeio/anytype/di/feature/onboarding/signup/OnboardingSoulCreationDI.kt

@@ -3,6 +3,7 @@ package com.anytypeio.anytype.di.feature.onboarding.signup
 import androidx.lifecycle.ViewModelProvider
 import com.anytypeio.anytype.CrashReporter
 import com.anytypeio.anytype.analytics.base.Analytics
+import com.anytypeio.anytype.core_utils.di.scope.PerScreen
 import com.anytypeio.anytype.di.common.ComponentDependencies
 import com.anytypeio.anytype.domain.account.AwaitAccountStartManager
 import com.anytypeio.anytype.domain.auth.interactor.CreateAccount
@@ -16,7 +17,9 @@ import com.anytypeio.anytype.domain.device.PathProvider
 import com.anytypeio.anytype.domain.misc.LocaleProvider
 import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
 import com.anytypeio.anytype.domain.`object`.ImportGetStartedUseCase
+import com.anytypeio.anytype.domain.payments.SetMembershipEmail
 import com.anytypeio.anytype.domain.platform.InitialParamsProvider
+import com.anytypeio.anytype.domain.resources.StringResourceProvider
 import com.anytypeio.anytype.domain.search.RelationsSubscriptionManager
 import com.anytypeio.anytype.domain.spaces.SpaceDeletedStatusWatcher
 import com.anytypeio.anytype.domain.subscriptions.GlobalSubscriptionManager
@@ -94,6 +97,14 @@ object OnboardingSoulCreationModule {
         dispatchers = dispatchers
     )
 
+    @JvmStatic
+    @Provides
+    @SoulCreationScreenScope
+    fun provideSetMembershipEmail(
+        repo: BlockRepository,
+        dispatchers: AppCoroutineDispatchers
+    ): SetMembershipEmail = SetMembershipEmail(repo = repo, dispatchers = dispatchers)
+
     @Module
     interface Declarations {
         @Binds
@@ -119,6 +130,7 @@ interface OnboardingSoulCreationDependencies : ComponentDependencies {
     fun userPermissionProvider(): UserPermissionProvider
     fun awaitAccountStartManager(): AwaitAccountStartManager
     fun globalSubscriptionManager(): GlobalSubscriptionManager
+    fun stringResourceProvider(): StringResourceProvider
 }
 
 @Scope