IOS migration.

.gitattributes

@@ -1,4 +1,6 @@
 android/app/libs/opuslib-release.aar filter=lfs diff=lfs merge=lfs -text
 screenshots/ filter=lfs diff=lfs merge=lfs -text
 assets/testing/ filter=lfs diff=lfs merge=lfs -text
+android/app/libs/alipaySdk-15.7.6-20200521195109.aar filter=lfs diff=lfs merge=lfs -text
+Internalsdk.xcframework filter=lfs diff=lfs merge=lfs -text
 android/app/libs/liblantern-all.aar filter=lfs diff=lfs merge=lfs -text

.github/workflows/browerstack.yml

@@ -2,18 +2,18 @@ name: BrowserStack CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ ios-migrate ]
   pull_request:
-    branches: [ main ]
+    branches: [ ios-migrate ]
 env:
   GOPRIVATE: github.com/getlantern
 
 jobs:
   build:
-    runs-on:
-      group: large-runners
+    runs-on: macos-13
+#      group: large-runners
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
 
@@ -28,50 +28,36 @@ jobs:
       - run: flutter --version
 
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.19
 
       - name: Granting private modules access
         run: |
-          git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
-
-      - name: Setup Sentry CLI
-        uses: mathieu-bour/setup-sentry-cli@v1
-        with:
-          version: latest
-          token: ${{ SECRETS.SENTRY_TOKEN }} # from GitHub secrets
-          organization: getlantern
-          project: android
+          git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
 
       - name: Setup JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: 17
 
-      - name: Setup protoc
-        uses: arduino/[email protected]
-        with:
-          version: '3.x'
-
-      - name: Activate protoc-gen-dart plugin
-        run: |
-          echo "${HOME}/.pub-cache/bin" >> $GITHUB_PATH
-          dart pub global activate protoc_plugin
-          mkdir -p "${HOME}/.pub-cache/bin"
-          mv "${FLUTTER_ROOT}/.pub-cache/bin/protoc-gen-dart" "${HOME}/.pub-cache/bin"
-
       - name: Build Android-Lib
         run: make android-lib ANDROID_ARCH=all
 
       - name: Build APK
-        env:
-          CI: "true"
         run: |
           flutter pub get
           make appium-test-build
 
+      - name: Build IOS-Framework
+        run: make build-framework
+
+      - name: Build IPA
+        run: |
+          flutter pub get
+          make appium-ios-ipa
+
       - name: List files in current directory
         run: ls -la
 
@@ -83,6 +69,7 @@ jobs:
           BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
           BROWSERSTACK_APP_PATH: "build/app/outputs/flutter-apk/app-appiumtest-debug.apk"
+          BROWSERSTACK_IOS_APP_PATH: "build/ios/ipa/Lantern.ipa"
         run: |
           response=$(curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY" \
             -X POST "https://api-cloud.browserstack.com/app-automate/upload" \
@@ -92,6 +79,16 @@ jobs:
           echo "$app_url"
           echo "BROWSERSTACK_APP_ID=$app_url" >> $GITHUB_ENV
 
+          # Upload iOS app
+          response_ios=$(curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY" \
+          -X POST "https://api-cloud.browserstack.com/app-automate/upload" \
+          -F "file=@$BROWSERSTACK_IOS_APP_PATH" \
+          -F "ios_keychain_support=true" \
+          -F "custom_id=LanternAppIOS") # Custom ID for the iOS app
+          app_url_ios=$(echo $response_ios | jq -r .app_url)
+          echo "iOS app URL: $app_url_ios"
+          echo "BROWSERSTACK_APP_ID_IOS=$app_url_ios" >> $GITHUB_ENV
+
       - name: Run Tests
         env:
           BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}

.github/workflows/go.yml

@@ -5,23 +5,25 @@ on:
     branches: [ main ]
   pull_request:
     branches: [ main ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 jobs:
 
   build:
     runs-on:
       group: large-runners
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install libpcap
       run: sudo apt-get install libpcap-dev
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
         go-version: 1.19
     - name: Granting private modules access
       run: |
-          git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
+          git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
     - name: Run Unit tests
       run: |
         go test -failfast -coverprofile=profile.cov ./...

.github/workflows/release.yml

@@ -81,7 +81,7 @@ jobs:
 
       - name: Granting private modules access
         run: |
-          git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
+          git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
 
       - name: Setup Sentry CLI
         uses: mathieu-bour/setup-sentry-cli@v1
@@ -100,7 +100,7 @@ jobs:
       - name: Setup protoc
         uses: arduino/setup-protoc@v2
         with:
-          repo-token: ${{ secrets.GH_TOKEN }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Activate protoc-gen-dart plugin
         run: |
@@ -208,7 +208,7 @@ jobs:
            releaseFiles: lantern-installer.aab
            track: production
         - name: Grant private modules access
-          run: git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
+          run: git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
         - name: Clone binaries repo
           run: git clone --depth 1 https://github.com/getlantern/lantern-binaries
         - name: Rename builds

.github/workflows/transifex-pull.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - name: Granting private modules access
       run: |
-          git config --global url."https://${{ secrets.GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
+          git config --global url."https://${{ secrets.CI_PRIVATE_REPOS_GH_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
     - uses: actions/checkout@v3
     - name: "Pull new translations"
       env:
@@ -28,4 +28,3 @@ jobs:
         git config user.email [email protected]
         git ls-files --modified assets/locales android/app/src/main/res | xargs git add
         git diff --cached --exit-code || git commit -m "updated translations..." && git push origin main
-

.gitignore

@@ -74,4 +74,6 @@ web*.pem
 screenshots
 profile.cov
 appium_kotlin/app/src/test/resources/local/local_config.json
+
+ios/internalsdk/Internalsdk.xcframework/
 android/app/libs/liblantern-all.aar

.metadata

@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled.
+
+version:
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+  channel: stable
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: macos
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

.run/Appium Test.run.xml → .run/appiumTest.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Appium Test" type="FlutterRunConfigurationType" factoryName="Flutter">
+  <configuration default="false" name="appiumTest" type="FlutterRunConfigurationType" factoryName="Flutter">
     <option name="additionalArgs" value="--dart-define=app.flavor=appiumTest" />
     <option name="buildFlavor" value="appiumTest" />
     <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />

.run/prod.run.xml

@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="prod" type="FlutterRunConfigurationType" factoryName="Flutter">
+    <option name="buildFlavor" value="prod" />
+    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
+    <method v="2" />
+  </configuration>
+</component>

DBModule/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

DBModule/Makefile

@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	xcodebuild -scheme DBModule -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.4' test

DBModule/Package.resolved

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "sqlite.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/stephencelis/SQLite.swift.git",
+      "state" : {
+        "revision" : "7a2e3cd27de56f6d396e84f63beefd0267b55ccb",
+        "version" : "0.14.1"
+      }
+    }
+  ],
+  "version" : 2
+}

DBModule/Package.swift

@@ -0,0 +1,33 @@
+// swift-tools-version: 5.8
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+  name: "DBModule",
+  products: [
+    // Products define the executables and libraries a package produces, making them visible to other packages.
+    .library(
+      name: "DBModule",
+      targets: ["DBModule"])
+  ],
+  dependencies: [
+    .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.14.1")
+  ],
+  targets: [
+    // Targets are the basic building blocks of a package, defining a module or a test suite.
+    // Targets can depend on other targets in this package and products from dependencies.
+    .binaryTarget(
+      name: "Internalsdk",
+      path: "../ios/internalsdk/Internalsdk.xcframework"),
+    .target(
+      name: "DBModule",
+      dependencies: [
+        "Internalsdk",
+        .product(name: "SQLite", package: "SQLite.swift"),
+      ]),
+    .testTarget(
+      name: "DBModuleTests",
+      dependencies: ["DBModule"]),
+  ]
+)