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

🤖 Add android subproject #3

Merged
merged 17 commits into from
Apr 28, 2024
Merged

🤖 Add android subproject #3

merged 17 commits into from
Apr 28, 2024

Conversation

phatblat
Copy link
Owner

Added android subproject to test new lint, format and build recipes.

gitbutler-client and others added 16 commits April 27, 2024 10:35
This is an integration commit for the virtual branches that GitButler is tracking.

Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily.

If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.

Here are the branches that are currently applied:
 - Add build target (refs/gitbutler/Add-build-target)
   branch head: 884575f
   - justfile
   - android/justfile
   - .github/workflows/pr-checks.yml
   - android/app/src/main/java/at/phatbl/androidapp/ui/theme/Type.kt
   - android/app/src/main/java/at/phatbl/androidapp/MainActivity.kt
   - android/app/src/main/java/at/phatbl/androidapp/ui/theme/Theme.kt
   - android/app/src/main/res/values/themes.xml
   - android/app/src/main/java/at/phatbl/androidapp/ui/theme/Color.kt
   - android/gradle/wrapper/gradle-wrapper.properties
   - android/app/src/main/res/xml/backup_rules.xml
   - android/app/build.gradle.kts
   - android/app/src/main/AndroidManifest.xml
   - android/app/src/main/res/drawable/ic_launcher_background.xml
   - android/gradle/libs.versions.toml
   - android/app/src/main/res/xml/data_extraction_rules.xml
   - android/app/src/main/res/drawable/ic_launcher_foreground.xml
   - android/app/src/test/java/at/phatbl/androidapp/ExampleUnitTest.kt
   - android/app/src/main/res/values/colors.xml
   - android/app/src/main/res/values/strings.xml
   - android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
   - android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
   - android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
   - android/app/src/androidTest/java/at/phatbl/androidapp/ExampleInstrumentedTest.kt
   - android/app/.gitignore
   - android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
   - android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
   - android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
   - android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
   - android/app/proguard-rules.pro
   - android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
   - android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
   - android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
   - android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
   - android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
   - android/build.gradle.kts
   - android/settings.gradle.kts
   - android/gradle.properties
   - android/.gitignore
   - android/gradlew
   - android/gradle/wrapper/gradle-wrapper.jar

Your previous branch was: refs/heads/main

The sha for that commit was: f9c807f

For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch
@phatblat phatblat added the enhancement New feature or request label Apr 28, 2024
@phatblat phatblat self-assigned this Apr 28, 2024
@phatblat phatblat mentioned this pull request Apr 28, 2024
@phatblat phatblat merged commit bbb7a06 into main Apr 28, 2024
2 checks passed
@phatblat phatblat deleted the android branch April 28, 2024 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants