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

Fastlane+Nix #26

Merged
merged 10 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,8 @@ app.*.map.json
/android/app/release
native/target
jniLibs


fastlane/google-play-secret.json
fastlane/report.xml
result
3 changes: 2 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ android {
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion
//targetSdkVersion flutter.targetSdkVersion
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
31 changes: 25 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,39 @@
buildscript {
ext.kotlin_version = '1.8.21'
repositories {
google()
mavenCentral()
if(project.hasProperty("nixMavenRepo")) {
repositories {
maven { url = nixMavenRepo }
}
} else {
repositories {
google()
mavenCentral()
}
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
//classpath "com.android.tools.lint:lint-gradle:30.3.1"
//classpath "com.android.tools.build:aapt2-proto:7.0.0-beta04-7396180"
}
}

allprojects {
repositories {
google()
mavenCentral()
if(project.hasProperty("nixMavenRepo")) {
repositories {
maven { url = nixMavenRepo }
}
buildscript {
repositories {
maven { url = nixMavenRepo }
}
}
} else {
repositories {
google()
mavenCentral()
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
23 changes: 23 additions & 0 deletions corrosion.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
diff --git a/linux/rust.cmake b/linux/rust.cmake
index a96586c..f9b8677 100644
--- a/linux/rust.cmake
+++ b/linux/rust.cmake
@@ -2,17 +2,7 @@
# many dependencies we would need to install Corrosion on the system.
# See instructions on https://github.com/AndrewGaspar/corrosion#cmake-install
# Once done, uncomment this line:
-# find_package(Corrosion REQUIRED)
-
-include(FetchContent)
-
-FetchContent_Declare(
- Corrosion
- GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git
- GIT_TAG origin/master # Optionally specify a version tag or branch here
-)
-
-FetchContent_MakeAvailable(Corrosion)
+find_package(Corrosion REQUIRED)

corrosion_import_crate(MANIFEST_PATH ../intiface-engine-flutter-bridge/Cargo.toml)

2 changes: 2 additions & 0 deletions fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
json_key_file("fastlane/google-play-secret.json")
package_name("com.iyox.wormhole") # e.g. com.krausefx.app
37 changes: 37 additions & 0 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This file contains the fastlane.tools configuration
# You can find the documentation at https://docs.fastlane.tools
#
# For a list of all available actions, check out
#
# https://docs.fastlane.tools/actions
#
# For a list of all available plugins, check out
#
# https://docs.fastlane.tools/plugins/available-plugins
#

# Uncomment the line if you want fastlane to automatically update itself
# update_fastlane

default_platform(:android)

platform :android do
desc "Deploy a new version to the Google Play"
lane :deploy do
commitnr = number_of_commits
changelog_from_git_commits

upload_to_play_store(track: 'internal',skip_upload_metadata: true,
skip_upload_images: true,
skip_upload_screenshots: true,
aab: "build/app/outputs/bundle/release/app-release.aab")
end

desc "elevate apk to aplpha track"
lane :elevate do

upload_to_play_store(track: 'internal', track_promote_to: 'production',version_code: commitnr,
skip_upload_apk: true, skip_upload_aab: true, skip_upload_metadata: true, skip_upload_changelogs: true, skip_upload_images: true, skip_upload_screenshots: true)
end
end

40 changes: 40 additions & 0 deletions fastlane/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
fastlane documentation
----

# Installation

Make sure you have the latest version of the Xcode command line tools installed:

```sh
xcode-select --install
```

For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)

# Available Actions

## Android

### android deploy

```sh
[bundle exec] fastlane android deploy
```

Deploy a new version to the Google Play

### android elevate

```sh
[bundle exec] fastlane android elevate
```

elevate apk to aplpha track

----

This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).

The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/27.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update 0.1.5 brings dynamic themes based on system preferences. Enjoy a personalized experience with smoother performance!
5 changes: 5 additions & 0 deletions fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
iyox Wormhole presents a streamlined approach to file sharing, emphasizing security and transparency. Leveraging the magic-wormhole protocol, it facilitates effortless transfer of files, irrespective of size or format, while ensuring end-to-end encryption for data security.

The app simplifies sharing through QR codes or passphrases, eliminating complexities associated with conventional methods like email attachments. With a focus on user privacy, iyox Wormhole employs robust encryption protocols, guaranteeing that only intended recipients can access shared files.

iyox Wormhole is designed to meet the needs of diverse users, offering a reliable, user-friendly solution for secure file sharing. Whether for personal or professional use, it ensures data integrity and confidentiality, setting a new standard in file transfer apps.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added fastlane/metadata/android/en-US/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/short_description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Secure, open-source file sharing
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/title.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
iyox Wormhole
Empty file.
Loading