Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

org.benoitharrault.jeweled
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4c1dd4b7

Commit 4c1dd4b7 authored 6 months ago by Benoît Harrault

Downloads
- Plain Diff

Merge branch '41-improve-build-process' into 'master'

Resolve "Improve build process"

Closes #41

See merge request !39

parents dfa7cac7 95c56720

Branches

Tags

Loading

Checking pipeline status

Changes 15
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 32 additions, 10 deletions

.gitlab-ci.yml
android/.gitignore 3 additions, 1 deletion

android/.gitignore
android/app/build.gradle 50 additions, 40 deletions

android/app/build.gradle
android/app/src/debug/AndroidManifest.xml 1 addition, 5 deletions

android/app/src/debug/AndroidManifest.xml
android/app/src/main/AndroidManifest.xml 11 additions, 3 deletions

android/app/src/main/AndroidManifest.xml
android/app/src/main/java/org/benoitharrault/jeweled/MainActivity.java 0 additions, 6 deletions

...rc/main/java/org/benoitharrault/jeweled/MainActivity.java
android/app/src/main/kotlin/org/benoitharrault/jeweled/MainActivity.kt 5 additions, 0 deletions

...rc/main/kotlin/org/benoitharrault/jeweled/MainActivity.kt
android/app/src/profile/AndroidManifest.xml 1 addition, 5 deletions

android/app/src/profile/AndroidManifest.xml
android/build.gradle 2 additions, 2 deletions

android/build.gradle
android/gradle.properties 1 addition, 3 deletions

android/gradle.properties
android/gradle/wrapper/gradle-wrapper.properties 1 addition, 1 deletion

android/gradle/wrapper/gradle-wrapper.properties
android/settings.gradle 4 additions, 5 deletions

android/settings.gradle
fastlane/metadata/android/en-US/changelogs/34.txt 1 addition, 0 deletions

fastlane/metadata/android/en-US/changelogs/34.txt
fastlane/metadata/android/fr-FR/changelogs/34.txt 1 addition, 0 deletions

fastlane/metadata/android/fr-FR/changelogs/34.txt
pubspec.yaml 1 addition, 1 deletion

pubspec.yaml

with 114 additions and 82 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment