diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 732d598..46c34e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - name: Check turborepo cache for Android run: | - TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run ci:android:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'ci:android:build:${{matrix.arch}}').cache.status") + TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run ci:android:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json --single-package)).tasks.find(t => t.task === 'ci:android:build:${{matrix.arch}}').cache.status") if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then echo "turbo_cache_hit=1" >> $GITHUB_ENV @@ -125,7 +125,7 @@ jobs: env: JAVA_OPTS: "-XX:MaxHeapSize=6g" run: | - yarn turbo run ci:android:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" + yarn turbo run ci:android:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }} --single-package" build-ios: runs-on: macos-latest @@ -154,7 +154,7 @@ jobs: - name: Check turborepo cache for iOS run: | - TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run ci:ios:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'ci:ios:build:${{matrix.arch}}').cache.status") + TURBO_CACHE_STATUS=$(node -p "($(yarn turbo run ci:ios:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json --single-package)).tasks.find(t => t.task === 'ci:ios:build:${{matrix.arch}}').cache.status") if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then echo "turbo_cache_hit=1" >> $GITHUB_ENV @@ -179,4 +179,4 @@ jobs: - name: Build example for iOS run: | - yarn turbo run ci:ios:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }}" + yarn turbo run ci:ios:build:${{matrix.arch}} --cache-dir="${{ env.TURBO_CACHE_DIR }} --single-package" diff --git a/example/package.json b/example/package.json index 0ca16ee..e5fa872 100644 --- a/example/package.json +++ b/example/package.json @@ -17,11 +17,7 @@ "typecheck": "tsc --noEmit", "theme:gen": "generate-theme-type src/design/AppTheme.ts ./../node_modules/@react-native-styled-system/core/lib/typescript/src/@types/ThemedTypings.d.ts", "pod:old": "cd ios && bundle install && RCT_NEW_ARCH_ENABLED=0 bundle exec pod install", - "pod:new": "cd ios && bundle install && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install", - "ci:android:build:new": "./../script/ci-android-build.sh", - "ci:android:build:old": "./../script/ci-android-build.sh", - "ci:ios:build:new": "./../script/ci-ios-build.sh", - "ci:ios:build:old": "./../script/ci-ios-build.sh" + "pod:new": "cd ios && bundle install && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install" }, "dependencies": { "@mj-studio/js-util": "^1.0.34", diff --git a/package.json b/package.json index 28dbf29..90f0d1b 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,11 @@ "codegen:android": "cd example/android && ./gradlew generateCodegenArtifactsFromSchema", "codegen:ios": "node node_modules/react-native/scripts/generate-codegen-artifacts.js --path example/ --outputPath example/ios", "codegen": "yarn codegen:android && yarn codegen:ios", - "watchman-refresh": "watchman watch-del $(pwd) ; watchman watch-project $(pwd)" + "watchman-refresh": "watchman watch-del $(pwd) ; watchman watch-project $(pwd)", + "ci:android:build:new": "script/ci-android-build.sh", + "ci:android:build:old": "script/ci-android-build.sh", + "ci:ios:build:new": "script/ci-ios-build.sh", + "ci:ios:build:old": "script/ci-ios-build.sh" }, "devDependencies": { "@commitlint/config-conventional": "^17.0.2", diff --git a/packages/core/LICENSE b/packages/core/LICENSE index 2fe5bea..c76e593 100644 --- a/packages/core/LICENSE +++ b/packages/core/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 mym0404 +Copyright (c) 2024 MJ Studio Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/packages/core/package.json b/packages/core/package.json index 3b0c3df..be77988 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -47,7 +47,9 @@ "typescript", "javascript", "react", - "expo" + "expo", + "kakao-login", + "kakao-auth" ], "repository": { "type": "git", diff --git a/packages/navi/LICENSE b/packages/navi/LICENSE index 2fe5bea..c76e593 100644 --- a/packages/navi/LICENSE +++ b/packages/navi/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 mym0404 +Copyright (c) 2024 MJ Studio Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/packages/share/LICENSE b/packages/share/LICENSE index 2fe5bea..c76e593 100644 --- a/packages/share/LICENSE +++ b/packages/share/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 mym0404 +Copyright (c) 2024 MJ Studio Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/packages/social/LICENSE b/packages/social/LICENSE index 2fe5bea..c76e593 100644 --- a/packages/social/LICENSE +++ b/packages/social/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 mym0404 +Copyright (c) 2024 MJ Studio Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/packages/user/LICENSE b/packages/user/LICENSE index 2fe5bea..c76e593 100644 --- a/packages/user/LICENSE +++ b/packages/user/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 mym0404 +Copyright (c) 2024 MJ Studio Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/script/ci-android-build.sh b/script/ci-android-build.sh index f8ce94d..51650f1 100755 --- a/script/ci-android-build.sh +++ b/script/ci-android-build.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a +cd example/android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a diff --git a/script/ci-ios-build.sh b/script/ci-ios-build.sh index 16026e2..6d0a32c 100755 --- a/script/ci-ios-build.sh +++ b/script/ci-ios-build.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -cd ios && xcodebuild -workspace KakaoExample.xcworkspace -scheme KakaoExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO +cd example/ios && xcodebuild -workspace KakaoExample.xcworkspace -scheme KakaoExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO diff --git a/turbo.json b/turbo.json index 5769cd5..2da1c9b 100644 --- a/turbo.json +++ b/turbo.json @@ -3,79 +3,67 @@ "pipeline": { "ci:android:build:new": { "inputs": [ - "package.json", - "android", "!android/build", - "packages/*/src", - "packages/*/android", - "packages/*/package.json", + "packages/**/src", + "packages/**/android", "packages/core/expo-config-plugin", - "example/package.json", "example/android", "!example/android/.gradle", "!example/android/build", "!example/android/app/build", - "!packages/*/lib", - "!packages/*/android/build" + "!packages/**/lib", + "!packages/**/android/build", + "**/package.json" ], "outputs": [] }, "ci:android:build:old": { "inputs": [ - "package.json", - "android", "!android/build", - "packages/*/src", - "packages/*/android", - "packages/*/package.json", + "packages/**/src", + "packages/**/android", "packages/core/expo-config-plugin", - "example/package.json", "example/android", "!example/android/.gradle", "!example/android/build", "!example/android/app/build", - "!packages/*/lib", - "!packages/*/android/build" + "!packages/**/lib", + "!packages/**/android/build", + "**/package.json" ], "outputs": [] }, "ci:ios:build:new": { "inputs": [ - "package.json", "packages/**/*.podspec", - "!android/build", - "packages/*/src", - "packages/*/ios", - "packages/*/package.json", + "packages/**/src", + "packages/**/ios", "packages/core/expo-config-plugin", - "example/package.json", "example/ios", "!example/android/.gradle", "!example/android/build", "!example/android/app/build", "!example/ios/build", "!example/ios/Pods", - "!packages/*/lib" + "!packages/**/lib", + "**/package.json" ], "outputs": [] }, "ci:ios:build:old": { "inputs": [ - "package.json", "packages/**/*.podspec", - "!android/build", - "packages/*/src", - "packages/*/ios", - "packages/*/package.json", + "packages/**/src", + "packages/**/ios", "packages/core/expo-config-plugin", - "example/package.json", "example/ios", "!example/android/.gradle", "!example/android/build", "!example/android/app/build", "!example/ios/build", "!example/ios/Pods", - "!packages/*/lib" + "!packages/**/lib", + "**/package.json" ], "outputs": [] }