.devcontainer/devcontainer.json

@@ -34,16 +34,7 @@
 	// "postCreateCommand": "cat /etc/os-release",
 
 	// Configure tool-specific properties.
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"dart-code.flutter",
-				"toroxx.vscode-avdmanager",
-				"androidgradletools.android-ide-extension",
-				"ms-vscode.cmake-tools"
-			]
-		}
-	},
+	// "customizations": {},
 
 	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "devcontainer"

TODO.md

@@ -1,3 +0,0 @@
-## dev-flutter TODO
-
-[ ] android sample app compiled during dev-init-android require dev-init-rust to be run first, make it rust-independent.

dev-init/dev-init-rust.sh

@@ -2,22 +2,22 @@
 
 set -e
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$SCRIPT_DIR/dev.env"
 
-mkdir -p ${RUSTUP_HOME} ${CARGO_HOME} 2> /dev/null || :
+mkdir -p ${RUSTUP_HOME} ${CARGO_HOME} 2>/dev/null ||:
 
 cd /tmp
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
-  && rustup default stable
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+rustup default stable
 rustup update
 rustup component add rustfmt clippy
 rustup target add wasm32-unknown-unknown
 rustup toolchain install nightly
 rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
 
-cargo install --version 2.12.0 flutter_rust_bridge_codegen
+cargo install --version 2.6.0 flutter_rust_bridge_codegen
 cargo install cargo-expand
 cargo install wasm-pack
 

dev-init/dev.env

@@ -1,6 +1,6 @@
 
 FLUTTER_ROOT=/opt/flutter
-FLUTTER_VERSION=3.44.2
+FLUTTER_VERSION=3.22.3
 FLUTTER_SAMPLE_PROJECT=/opt/sample_projects/flutter_linux_web_demo
 RUST_SAMPLE_PROJECT=/opt/sample_projects/flutter_rust_demo
 ANDROID_SAMPLE_PROJECT=/opt/sample_projects/flutter_android_demo

projects/README.md

@@ -1,5 +0,0 @@
-# projects directory
-
-1. Clone your flutter project repo here.
-2. Open parent (dev-flutter) dir in devcontainer.
-3. Open cloned projects/yourproject in your IDE using the same container

sample_projects/flutter_android_demo/build.sh

@@ -12,10 +12,6 @@ flutter config --enable-android
 
 if [ ! -f lib/main.dart ]; then
     flutter create -t app .
-fi
-
-# Run integrate if the config file is missing
-if [ ! -f flutter_rust_bridge.yaml ]; then
     flutter_rust_bridge_codegen integrate
 fi
 
@@ -49,3 +45,4 @@ flutter_rust_bridge_codegen generate
 # flutter_rust_bridge_codegen build-web
 
 flutter build apk --verbose
+