chore: bump version to 0.7.5

yadokani389 · Feb 18, 2025 · 157642e · 157642e
1 parent 16fc75b
commit 157642e
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 34 deletions.
diff --git a/flake.nix b/flake.nix
@@ -1,17 +1,24 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    old-nixpkgs.url =
-      "github:NixOS/nixpkgs/0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb";
+    old-nixpkgs.url = "github:NixOS/nixpkgs/0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { nixpkgs, old-nixpkgs, flake-utils, rust-overlay, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      nixpkgs,
+      old-nixpkgs,
+      flake-utils,
+      rust-overlay,
+      ...
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = import nixpkgs {
           inherit system;
@@ -41,13 +48,25 @@
           cmdLineToolsVersion = "13.0";
           toolsVersion = "26.1.1";
           platformToolsVersion = "35.0.1";
-          buildToolsVersions = [ "30.0.3" "34.0.0" ];
+          buildToolsVersions = [
+            "30.0.3"
+            "34.0.0"
+          ];
           includeEmulator = false;
-          platformVersions = [ "28" "29" "30" "33" "34" ];
+          platformVersions = [
+            "28"
+            "29"
+            "30"
+            "33"
+            "34"
+          ];
           includeSources = false;
           includeSystemImages = false;
           systemImageTypes = [ "google_apis_playstore" ];
-          abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+          abiVersions = [
+            "armeabi-v7a"
+            "arm64-v8a"
+          ];
           cmakeVersions = [ "3.10.2" ];
           includeNDK = true;
           ndkVersions = [ "26.3.11579264" ];
@@ -56,26 +75,39 @@
           includeExtras = [ "extras;google;gcm" ];
         };
 
-      in rec {
+      in
+      rec {
         packages.default = pkgs.callPackage ./package.nix { };
         devShells.default = pkgs.mkShell {
           inherit (packages.default) buildInputs;
-          nativeBuildInputs = packages.default.nativeBuildInputs
-            ++ (with pkgs; [ rustc gcc rustfmt clippy ]);
+          nativeBuildInputs =
+            packages.default.nativeBuildInputs
+            ++ (with pkgs; [
+              rustc
+              gcc
+              rustfmt
+              clippy
+            ]);
         };
 
         devShells.android = pkgs.mkShell rec {
           inherit (packages.default) buildInputs;
-          nativeBuildInputs = packages.default.nativeBuildInputs
-            ++ [ rust-toolchain androidComposition.androidsdk ]
-            ++ (with pkgs; [ jdk17 gradle ]);
+          nativeBuildInputs =
+            packages.default.nativeBuildInputs
+            ++ [
+              rust-toolchain
+              androidComposition.androidsdk
+            ]
+            ++ (with pkgs; [
+              jdk17
+              gradle
+            ]);
 
           ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
           NDK_HOME = "${ANDROID_HOME}/ndk-bundle";
-          GRADLE_OPTS =
-            "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidComposition.androidsdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
-          XDG_DATA_DIRS =
-            "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidComposition.androidsdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+          XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}";
         };
-      });
+      }
+    );
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "umegaemochi",
   "private": true,
-  "version": "0.7.4",
+  "version": "0.7.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/package.nix b/package.nix
@@ -1,19 +1,32 @@
-{ lib, stdenv, cargo-tauri, glib-networking, nodejs, openssl, pkg-config, pnpm_9
-, rustPlatform, webkitgtk_4_1, wrapGAppsHook4, }:
+{
+  lib,
+  stdenv,
+  cargo-tauri,
+  glib-networking,
+  nodejs,
+  openssl,
+  pkg-config,
+  pnpm_9,
+  rustPlatform,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "umegaemochi";
 
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = lib.fileset.toSource {
     root = ./.;
-    fileset = lib.fileset.difference ./. (lib.fileset.unions [
-      (lib.fileset.maybeMissing ./result)
-      ./package.nix
-      ./flake.nix
-      ./flake.lock
-    ]);
+    fileset = lib.fileset.difference ./. (
+      lib.fileset.unions [
+        (lib.fileset.maybeMissing ./result)
+        ./package.nix
+        ./flake.nix
+        ./flake.lock
+      ]
+    );
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -24,8 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   cargoRoot = "src-tauri";
   buildAndTestSubdir = finalAttrs.cargoRoot;
 
-  cargoDeps =
-    rustPlatform.importCargoLock { lockFile = ./src-tauri/Cargo.lock; };
+  cargoDeps = rustPlatform.importCargoLock { lockFile = ./src-tauri/Cargo.lock; };
 
   nativeBuildInputs = [
     cargo-tauri.hook
@@ -36,7 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook4
   ];
 
-  buildInputs = [ glib-networking openssl webkitgtk_4_1 ];
+  buildInputs = [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
 
   meta = {
     license = lib.licenses.mit;

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "umegaemochi"
-version = "0.7.4"
+version = "0.7.5"
 description = "A Tauri App"
 authors = ["yadokani389"]
 edition = "2021"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "umegaemochi",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "identifier": "com.yadokani389.umegaemochi",
   "build": {
     "beforeDevCommand": "pnpm dev",