Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Expo for React Native #219

Merged
merged 31 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6499193
Add expo project
NigelBreslaw Jan 24, 2024
2309c02
Expo + ios
NigelBreslaw Jan 24, 2024
2c83484
Add android
NigelBreslaw Jan 24, 2024
ddabbd0
Tweak versions
NigelBreslaw Jan 24, 2024
a09ed40
Tweak .gitignore
NigelBreslaw Jan 24, 2024
48eb48a
Add missing files
NigelBreslaw Jan 24, 2024
2a5b864
Update Android icons
NigelBreslaw Jan 24, 2024
127b250
Update gradle
NigelBreslaw Jan 24, 2024
e1a80fc
Test android build
NigelBreslaw Jan 24, 2024
6270588
Use npm
NigelBreslaw Jan 24, 2024
06a40a6
Revert "Update gradle"
NigelBreslaw Jan 24, 2024
5830237
Fix build
NigelBreslaw Jan 24, 2024
486adee
Tweak
NigelBreslaw Jan 24, 2024
9d7e132
Use the NDK github-actions already has
NigelBreslaw Jan 24, 2024
caa5690
Stop the debug signing
NigelBreslaw Jan 24, 2024
146ac6f
Remove pointless view
NigelBreslaw Jan 24, 2024
fc0863a
Deploy for android only on main
NigelBreslaw Jan 24, 2024
1208aed
Make new iOS project build
NigelBreslaw Jan 24, 2024
8d54134
Start of auto build for iOS
NigelBreslaw Jan 24, 2024
a39fce8
Updated
NigelBreslaw Jan 24, 2024
6119c33
Update xcode script
NigelBreslaw Jan 24, 2024
ad6f424
Replace old project with Expo
NigelBreslaw Jan 24, 2024
32bf428
Tweak CI
NigelBreslaw Jan 24, 2024
ef0b68c
Try this
NigelBreslaw Jan 24, 2024
7fd7b8c
Find out path in Xcode cloud
NigelBreslaw Jan 24, 2024
6a023b4
Whoops
NigelBreslaw Jan 24, 2024
e3b8820
Change to correct path
NigelBreslaw Jan 24, 2024
83f0852
No need to check Ruby
NigelBreslaw Jan 24, 2024
90765ed
Replace missing sonarqube config
NigelBreslaw Jan 24, 2024
09effcf
Trigger CI
NigelBreslaw Jan 24, 2024
3752b1b
Trigger builds
NigelBreslaw Jan 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,34 +44,3 @@ jobs:
uses: github/codeql-action/[email protected]
with:
category: "/language:javascript-typescript"

analyze-ruby:
name: Analyze Ruby

runs-on: 'ubuntu-latest'
timeout-minutes: 5
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false

steps:
- name: Checkout repository
uses: actions/[email protected]

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/[email protected]
with:
languages: 'ruby'

- name: Autobuild
uses: github/codeql-action/[email protected]

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected]
with:
category: "/language:ruby"
24 changes: 13 additions & 11 deletions .github/workflows/deploy-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,28 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: native_gg
working-directory: native_gg2
timeout-minutes: 10
steps:
- uses: actions/[email protected]
- uses: pnpm/[email protected]
with:
version: 8.14.1
# - uses: pnpm/[email protected]
# with:
# version: 8.14.1
- uses: actions/[email protected]
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '21'

java-version: '17'
- uses: actions/setup-node@v4
with:
node-version: 20.11.0
- name: install dependencies
run: pnpm install --frozen-lockfile
run: npm ci

# Automatically overrides the version code and version name through the github actions
- name: Bump version
uses: chkfung/[email protected]
with:
gradlePath: native_gg/android/app/build.gradle
gradlePath: native_gg2/android/app/build.gradle
versionCode: ${{github.run_number}}
versionName: '1.0.0'

Expand All @@ -47,7 +49,7 @@ jobs:
# ID used to access action output
id: sign_app
with:
releaseDirectory: native_gg/android/app/build/outputs/bundle/release
releaseDirectory: native_gg2/android/app/build/outputs/bundle/release
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
Expand All @@ -66,8 +68,8 @@ jobs:
with:
serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
packageName: com.guardianghost
releaseFiles: native_gg/android/app/build/outputs/bundle/release/app-release.aab
whatsNewDirectory: native_gg/android/WhatsNew
releaseFiles: native_gg2/android/app/build/outputs/bundle/release/app-release.aab
whatsNewDirectory: native_gg2/android/WhatsNew
track: internal
# TODO: Change to completed or remove the status line once alpha or beta testing tracks are ready.
status: draft
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
run: cd gg-mono && pnpm format:check
- name: build
run: cd gg-mono && pnpm build:ci
- name: install dependencies
run: cd native_gg && pnpm install --frozen-lockfile
- name: lint
run: cd native_gg && pnpm lint
- name: format
run: cd native_gg && pnpm format:check
# - name: install dependencies
# run: cd native_gg && pnpm install --frozen-lockfile
# - name: lint
# run: cd native_gg && pnpm lint
# - name: format
# run: cd native_gg && pnpm format:check


changes:
Expand Down
2 changes: 0 additions & 2 deletions native_gg/.bundle/config

This file was deleted.

4 changes: 0 additions & 4 deletions native_gg/.eslintrc.js

This file was deleted.

80 changes: 13 additions & 67 deletions native_gg/.gitignore
Original file line number Diff line number Diff line change
@@ -1,68 +1,14 @@
# OSX
#
.DS_Store

# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local

# Android/IntelliJ
#
build/
.idea
.gradle
local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore
*.aab
*.apk

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage
.expo/
dist/
npm-debug.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision
*.orig.*
web-build/

# macOS
.DS_Store
1 change: 0 additions & 1 deletion native_gg/.watchmanconfig

This file was deleted.

36 changes: 36 additions & 0 deletions native_gg/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { StatusBar } from 'expo-status-bar';
import { StyleSheet, Text, View } from 'react-native';
import { Image } from 'expo-image';
import { LinearGradient } from 'expo-linear-gradient';

export default function App() {
return (
<View style={styles.container}>
<LinearGradient
colors={['#232526', '#66686a']}
style={{ position: 'absolute', left: 0, right: 0, top: 0, bottom: 0 }}
/>

<Image
style={{ width: 200, height: 200 }}
contentFit="contain"
source="https://d33wubrfki0l68.cloudfront.net/554c3b0e09cf167f0281fda839a5433f2040b349/ecfc9/img/header_logo.svg"
/>

<Text style={{ fontSize: 22, marginTop: 15, color: '#fff' }}>
New Architecture: <Text style={{ fontWeight: 'bold' }}>Enabled</Text>
</Text>

< StatusBar style="auto" />
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
alignItems: 'center',
justifyContent: 'center',
},
});
109 changes: 0 additions & 109 deletions native_gg/App.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions native_gg/Gemfile

This file was deleted.

Loading