From c83926793b320f668a783b998bd46ffef7a7444d Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Sun, 8 Sep 2024 00:45:36 +0900 Subject: [PATCH 1/3] update ci_scripts --- app-ios/App/ci_scripts/ci_post_clone.sh | 4 ++-- app-ios/App/ci_scripts/ci_pre_xcodebuild.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app-ios/App/ci_scripts/ci_post_clone.sh b/app-ios/App/ci_scripts/ci_post_clone.sh index 95a9e0482..611b24a67 100644 --- a/app-ios/App/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/ci_scripts/ci_post_clone.sh @@ -1,9 +1,9 @@ #!/bin/zsh -cd "$CI_WORKSPACE" +cd "$CI_PRIMARY_REPOSITORY_PATH" brew install openjdk@17 export PATH="/usr/local/opt/openjdk@17/bin:$PATH" -./gradlew :app-ios-shared:assembleSharedReleaseXCFramework +./gradlew app-ios-shared:assembleSharedDebugXCFramework -Papp.ios.shared.arch=arm64 --no-configuration-cache diff --git a/app-ios/App/ci_scripts/ci_pre_xcodebuild.sh b/app-ios/App/ci_scripts/ci_pre_xcodebuild.sh index f32f7a511..9505a5a6b 100644 --- a/app-ios/App/ci_scripts/ci_pre_xcodebuild.sh +++ b/app-ios/App/ci_scripts/ci_pre_xcodebuild.sh @@ -1,9 +1,13 @@ #!/bin/sh -cd "$CI_WORKSPACE" +cd "$CI_PRIMARY_REPOSITORY_PATH" # Enalbe skip plugin validation defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES +defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES + +SOURCE_PACKAGES_PATH="$CI_PRIMARY_REPOSITORY_PATH/app-ios/SourcePackages" +xcodebuild -resolvePackageDependencies -project $CI_PROJECT_FILE_PATH -scheme DroidKaigi2024App -derivedDataPath $CI_DERIVED_DATA_PATH -clonedSourcePackagesDirPath $SOURCE_PACKAGES_PATH # workaround for xcode cloud brew install mint @@ -11,10 +15,8 @@ brew install mint mint install cybozu/LicenseList mint install SwiftGen/SwiftGen -SOURCE_PACKAGES_PATH="$CI_WORKSPACE/app-ios/SourcePackages" -xcodebuild -resolvePackageDependencies -project $CI_PROJECT_FILE_PATH -scheme DroidKaigi2024App -derivedDataPath $CI_DERIVED_DATA_PATH -clonedSourcePackagesDirPath $SOURCE_PACKAGES_PATH - -mint run LicenseList "$CI_WORKSPACE/app-ios/Sources/About/Resources" $SOURCE_PACKAGES_PATH +mint run LicenseList "$CI_PRIMARY_REPOSITORY_PATH/app-ios/Sources/App/Resources" $SOURCE_PACKAGES_PATH -export DERIVED_SOURCES_DIR="$CI_WORKSPACE/app-ios/Sources/Theme/" -mint run SwiftGen --config "$CI_WORKSPACE/app-ios/Sources/Theme/swiftgen.yml" +# generate code +export DERIVED_SOURCES_DIR="$CI_PRIMARY_REPOSITORY_PATH/app-ios/Sources/Theme/" +mint run SwiftGen --config "$CI_PRIMARY_REPOSITORY_PATH/app-ios/Sources/Theme/swiftgen.yml" From 62f9f35204c88d64db0f68e380c0340c93262745 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 9 Sep 2024 00:48:19 +0900 Subject: [PATCH 2/3] fix args, add make command --- app-ios/App/ci_scripts/ci_post_clone.sh | 2 +- app-ios/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app-ios/App/ci_scripts/ci_post_clone.sh b/app-ios/App/ci_scripts/ci_post_clone.sh index 611b24a67..e0908f005 100644 --- a/app-ios/App/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/ci_scripts/ci_post_clone.sh @@ -6,4 +6,4 @@ brew install openjdk@17 export PATH="/usr/local/opt/openjdk@17/bin:$PATH" -./gradlew app-ios-shared:assembleSharedDebugXCFramework -Papp.ios.shared.arch=arm64 --no-configuration-cache +./gradlew app-ios-shared:assembleSharedXCFramework -Papp.ios.shared.arch=arm64Debug --no-configuration-cache diff --git a/app-ios/Makefile b/app-ios/Makefile index aec0e3674..b8c99731d 100644 --- a/app-ios/Makefile +++ b/app-ios/Makefile @@ -19,6 +19,11 @@ build-kmp-module-debug: cd .. && \ ./gradlew app-ios-shared:assembleSharedXCFramework -Papp.ios.shared.arch=arm64SimulatorDebug --no-configuration-cache +.PHONY: build-kmp-module-arm64 +build-kmp-module-arm64: + cd .. && \ + ./gradlew app-ios-shared:assembleSharedXCFramework -Papp.ios.shared.arch=arm64Debug --no-configuration-cache + .PHONY: build-app-debug build-app-debug: build-kmp-module-debug set -o pipefail && \ From de63bd68a28bfccbc2b5280e41d7496f25bc76cf Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 9 Sep 2024 02:29:01 +0900 Subject: [PATCH 3/3] add version specification, remove android strings --- app-ios-shared/build.gradle.kts | 2 ++ app-ios/Sources/AboutFeature/Localizable.xcstrings | 4 ++-- .../ContributorFeature/Resources/Localizable.xcstrings | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app-ios-shared/build.gradle.kts b/app-ios-shared/build.gradle.kts index 065a7c1b3..b6d96176c 100644 --- a/app-ios-shared/build.gradle.kts +++ b/app-ios-shared/build.gradle.kts @@ -13,6 +13,8 @@ plugins { id("droidkaigi.primitive.kmp.roborazzi") } +version = "0.0.1" + kotlin { val frameworkName = "shared" val xcf = XCFramework(frameworkName) diff --git a/app-ios/Sources/AboutFeature/Localizable.xcstrings b/app-ios/Sources/AboutFeature/Localizable.xcstrings index 20baba227..b0f7623f8 100644 --- a/app-ios/Sources/AboutFeature/Localizable.xcstrings +++ b/app-ios/Sources/AboutFeature/Localizable.xcstrings @@ -199,13 +199,13 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "DroidKaigi is a conference tailored for Android developers." + "value" : "DroidKaigi is a conference tailored for developers." } }, "ja" : { "stringUnit" : { "state" : "needs_review", - "value" : "DroidKaigiはAndroid技術情報の共有とコミュニケーションを目的に開催されるエンジニアが主役のAndroidカンファレンスです。" + "value" : "DroidKaigiは技術情報の共有とコミュニケーションを目的に開催されるエンジニアが主役のAndroidカンファレンスです。" } } } diff --git a/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings b/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings index e7f58f053..5f988f1ea 100644 --- a/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings +++ b/app-ios/Sources/ContributorFeature/Resources/Localizable.xcstrings @@ -1,6 +1,9 @@ { "sourceLanguage" : "en", "strings" : { + "%lld" : { + + }, "Contributor" : { "localizations" : { "en" : { @@ -51,4 +54,4 @@ } }, "version" : "1.0" -} +} \ No newline at end of file