Skip to content

Commit

Permalink
Merge pull request #24 from Universite-Gustave-Eiffel/feature/remove-…
Browse files Browse the repository at this point in the history
…appyx

Feature/remove appyx
  • Loading branch information
nicolas-f authored Jul 25, 2024
2 parents e6c1e8c + 443a006 commit 8c837a1
Show file tree
Hide file tree
Showing 212 changed files with 2,851 additions and 5,099 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: ./.github/actions/job-set-up

- name: Run tests
run: ./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest
run: ./gradlew :composeApp:cleanTestDebugUnitTest :composeApp:testDebugUnitTest

- name: Upload reports
if: always()
Expand All @@ -46,10 +46,10 @@ jobs:
uses: ./.github/actions/job-set-up

- name: Compile Android binary
run: ./gradlew :androidApp:clean :androidApp:build
run: ./gradlew :composeApp:clean :composeApp:assembleDebug

- name: Run tests
run: ./gradlew :androidApp:cleanTestDebugUnitTest :shared:testDebugUnitTest
run: ./gradlew :composeApp:cleanTestDebugUnitTest :composeApp:testDebugUnitTest

- name: Upload reports
if: always()
Expand Down Expand Up @@ -80,8 +80,11 @@ jobs:
with:
cache-disabled: true

- name: run tests
run: ./gradlew :shared:cleanIosSimulatorArm64Test :shared:iosSimulatorArm64Test
- name: Compile iOS binary
run: ./gradlew :composeApp:clean :composeApp:iosSimulatorArm64Binaries

- name: Run tests
run: ./gradlew :composeApp:cleanIosSimulatorArm64Test :composeApp:iosSimulatorArm64Test

- name: Upload reports
if: always()
Expand Down
42 changes: 15 additions & 27 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
*.iml
.gradle
.idea
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
build/
/captures
.externalNativeBuild
.cxx
local.properties
venv/
yarn.lock
iosApp/Podfile.lock
iosApp/Pods/*
iosApp/iosApp.xcworkspace/*
iosApp/iosApp.xcodeproj/*
!iosApp/iosApp.xcodeproj/project.pbxproj
shared/shared.podspec
androidApp/release

# IntelliJ .idea folder
.idea/workspace.xml
.idea/misc.xml
.idea/caches
.idea/compiler.xml
.idea/artifacts
.idea/deploymentTargetDropDown.xml
.idea/androidTestResultsUserPreferences.xml
.idea/assetWizardSettings.xml
.idea/modules.xml
.idea/appInsightsSettings.xml
backup/androidApp/release
.kotlin
**/build/
xcuserdata
!src/**/build/
captures
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcodeproj/project.xcworkspace/
!*.xcworkspace/contents.xcworkspacedata
**/xcshareddata/WorkspaceSettings.xcsettings
gradle.xml

# Store the old files in a temporary folder until refactor is complete
backup/
73 changes: 0 additions & 73 deletions androidApp/build.gradle.kts

This file was deleted.

21 changes: 0 additions & 21 deletions androidApp/proguard-rules.pro

This file was deleted.

This file was deleted.

Binary file removed androidApp/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file removed androidApp/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 0 additions & 10 deletions androidApp/src/main/res/values/colors.xml

This file was deleted.

3 changes: 0 additions & 3 deletions androidApp/src/main/res/values/strings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions androidApp/src/main/res/values/themes.xml

This file was deleted.

13 changes: 0 additions & 13 deletions androidApp/src/main/res/xml/backup_rules.xml

This file was deleted.

19 changes: 0 additions & 19 deletions androidApp/src/main/res/xml/data_extraction_rules.xml

This file was deleted.

Loading

0 comments on commit 8c837a1

Please sign in to comment.