Skip to content
Open
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ EMULATOR_ID := emulator-5554
all: run

run: ## Run the app
flutter run -d emulator-5554 --hot
flutter run -d $(EMULATOR_ID) --hot

.PHONY: help
help: ## help target to show available commands with information
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
compileSdk = flutter.compileSdkVersion

// ndkVersion = flutter.ndkVersion
ndkVersion = "26.1.10909125"
ndkVersion = "28.2.13676358"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
Expand All @@ -33,7 +33,7 @@ android {
minSdk = 24
targetSdk = 36
buildToolsVersion = "36.0.0"
manifestPlaceholders["appAuthRedirectScheme"] = "zprofile"
manifestPlaceholders["appAuthRedirectScheme"] = "com.zprofile.client"
}

buildTypes {
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:label="zprofile"
android:name="${applicationName}"
android:usesCleartextTraffic="true"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:taskAffinity=""
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
Expand Down
2 changes: 1 addition & 1 deletion android/build/reports/problems/problems-report.html
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
<script type="text/javascript">
function configurationCacheProblems() { return (
// begin-report-data
{"diagnostics":[{"problem":[{"text":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 9.0."}],"contextualLabel":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#deprecated_missing_project_directory","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"configuring-project-without-an-existing-directory-is-deprecated-the-configured-projectdirectory-nix-store-rj-vg-rl-p-ilzqj-fx-a-kq-lf-a-flutter-wrapped-sdk-links-packages-flutter-tools-gradle-does-not-exist-can-t-be-written-to-or-is-not-a-directory-this-behavior-has-been-deprecated","displayName":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"solutions":[[{"text":"Make sure the project directory exists and can be written."}]]},{"problem":[{"text":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 9.0."}],"contextualLabel":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#deprecated_missing_project_directory","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"configuring-project-without-an-existing-directory-is-deprecated-the-configured-projectdirectory-nix-store-rj-vg-rl-p-ilzqj-fx-a-kq-lf-a-flutter-wrapped-sdk-links-packages-flutter-tools-gradle-does-not-exist-can-t-be-written-to-or-is-not-a-directory-this-behavior-has-been-deprecated","displayName":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/rj7vg4rl6p6ilzqj4fx13a78kq99lf7a-flutter-wrapped-3.32.8-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"solutions":[[{"text":"Make sure the project directory exists and can be written."}]]}],"problemsReport":{"totalProblemCount":2,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.12/userguide/problems-report.html","documentationLinkCaption":"Problem report","summaries":[]}}
{"diagnostics":[{"problem":[{"text":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 9.0."}],"contextualLabel":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#deprecated_missing_project_directory","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"configuring-project-without-an-existing-directory-is-deprecated-the-configured-projectdirectory-nix-store-vjwj-wpaxfqq-gwmnynl-hl-fmzqjsa-flutter-wrapped-sdk-links-packages-flutter-tools-gradle-does-not-exist-can-t-be-written-to-or-is-not-a-directory-this-behavior-has-been-deprecated","displayName":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"solutions":[[{"text":"Make sure the project directory exists and can be written."}]]},{"problem":[{"text":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This will fail with an error in Gradle 9.0."}],"contextualLabel":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated.","documentationLink":"https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#deprecated_missing_project_directory","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"configuring-project-without-an-existing-directory-is-deprecated-the-configured-projectdirectory-nix-store-vjwj-wpaxfqq-gwmnynl-hl-fmzqjsa-flutter-wrapped-sdk-links-packages-flutter-tools-gradle-does-not-exist-can-t-be-written-to-or-is-not-a-directory-this-behavior-has-been-deprecated","displayName":"Configuring project ':' without an existing directory is deprecated. The configured projectDirectory '/nix/store/vjwj46wpaxfqq6gwmnynl4hl6fmzqjsa-flutter-wrapped-3.38.3-sdk-links/packages/flutter_tools/gradle' does not exist, can't be written to or is not a directory. This behavior has been deprecated."}],"solutions":[[{"text":"Make sure the project directory exists and can be written."}]]}],"problemsReport":{"totalProblemCount":2,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.12/userguide/problems-report.html","documentationLinkCaption":"Problem report","summaries":[]}}
// end-report-data
);}
</script>
Expand Down
65 changes: 33 additions & 32 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 6 additions & 14 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@

devenv.shells.default = {
name = "Mobile application for ZProfile";

languages.kotlin.enable = true;
secretspec.enable = true;

# NOTE: First do devenv shell
Expand All @@ -60,21 +58,24 @@
android = {
enable = true;
flutter.enable = true;
platforms.version = ["36" "35"];
platforms.version = ["36" "35" "34" "33"];
systemImageTypes = ["google_apis_playstore"];
abis = ["arm64-v8a" "x86_64"];
cmake.version = ["4.0.2"];
cmdLineTools.version = "19.0";
tools.version = "26.1.1";
platformTools.version = "36.0.0";
buildTools.version = ["36.0.0"];
buildTools.version = ["36.0.0" "34.0.0" "33.0.0"];
emulator = {
enable = true;
version = "36.1.2";
};
sources.enable = true;
systemImages.enable = true;
ndk.enable = true;
ndk = {
enable = true;
version = ["28.2.13676358"];
};
googleAPIs.enable = true;
googleTVAddOns.enable = true;
extras = ["extras;google;gcm"];
Expand All @@ -87,10 +88,6 @@
"intel-android-sysimage-license"
"mips-android-sysimage-license"
];
android-studio = {
enable = false;
package = pkgs.android-studio;
};
};

devenv.root = let
Expand All @@ -101,11 +98,6 @@
packages = with pkgs; [
sops
];

# enterShell = ''
# export ANDROID_SDK_ROOT=$HOME/Android/Sdk
# export PATH=$ANDROID_SDK_ROOT/emulator:$ANDROID_SDK_ROOT/platform-tools:$PATH
# '';
};
};
};
Expand Down
Loading