diff --git a/.woodpecker.yml b/.woodpecker.yml index 7f6fdea..4ddc098 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,11 +1,24 @@ pipeline: lint: - image: dart:2.18.1 + image: dart:3.0.7 commands: - - dart pub get + # Proxy requests to pub.dev using pubcached + - PUB_HOSTED_URL=http://172.17.0.1:8000 dart pub get --no-precompile - dart analyze --fatal-infos --fatal-warnings test: - image: dart:2.18.1 + image: dart:3.0.7 commands: - dart pub get - dart test + notify: + image: git.polynom.me/papatutuwawa/woodpecker-xmpp + settings: + xmpp_tls: 1 + xmpp_is_muc: 1 + xmpp_recipient: moxxy-build@muc.moxxy.org + xmpp_alias: 2Bot + secrets: [ xmpp_jid, xmpp_password, xmpp_server ] + when: + status: + - success + - failure diff --git a/flake.lock b/flake.lock index 1ecb793..586ca41 100644 --- a/flake.lock +++ b/flake.lock @@ -17,16 +17,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1657540956, - "narHash": "sha256-ihGbOFWtAkENwxBE5kV/yWt2MncvW+BObLDsmxCLo/Q=", - "owner": "NANASHI0X74", + "lastModified": 1692311226, + "narHash": "sha256-mRzNup0PIUD6YxbrYvjzL7f+1oaOGy9nmGCV3AZkQus=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "043de04db8a6b0391b3fefaaade160514d866946", + "rev": "ef8288935ba859fc3b30632fa6e04705f81b9c2a", "type": "github" }, "original": { - "owner": "NANASHI0X74", - "ref": "flutter-3-0-0", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 5a958be..7cfe647 100644 --- a/flake.nix +++ b/flake.nix @@ -1,46 +1,21 @@ { description = "moxlib"; inputs = { - nixpkgs.url = "github:NANASHI0X74/nixpkgs/flutter-3-0-0"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - config = { - android_sdk.accept_license = true; - allowUnfree = true; - }; }; - android = pkgs.androidenv.composeAndroidPackages { - # TODO: Find a way to pin these - #toolsVersion = "26.1.1"; - #platformToolsVersion = "31.0.3"; - #buildToolsVersions = [ "31.0.0" ]; - #includeEmulator = true; - #emulatorVersion = "30.6.3"; - platformVersions = [ "28" ]; - includeSources = false; - includeSystemImages = true; - systemImageTypes = [ "default" ]; - abiVersions = [ "x86_64" ]; - includeNDK = false; - useGoogleAPIs = false; - useGoogleTVAddOns = false; - }; - pinnedJDK = pkgs.jdk; in { devShell = pkgs.mkShell { buildInputs = with pkgs; [ - flutter pinnedJDK android.platform-tools dart # Flutter + dart # Dart gitlint jq # Code hygiene ripgrep # General utilities ]; - - ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; - JAVA_HOME = pinnedJDK; - ANDROID_AVD_HOME = (toString ./.) + "/.android/avd"; }; }); } diff --git a/pubspec.yaml b/pubspec.yaml index 263b423..61b61be 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,4 +16,4 @@ dependencies: dev_dependencies: flutter_lints: ^2.0.0 test: ^1.20.1 - very_good_analysis: ^3.0.1 + very_good_analysis: ^5.0.0