diff --git a/.github/workflows/flutter_build.yml b/.github/workflows/flutter_build.yml
index 3e0e02b..2323202 100644
--- a/.github/workflows/flutter_build.yml
+++ b/.github/workflows/flutter_build.yml
@@ -29,19 +29,22 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install Flutter
+      - name: Install flutter
         uses: subosito/flutter-action@v2
         with:
           channel: stable
           cache: true
 
+      - name: Configure flutter
+        run: flutter config --no-cli-animations --no-analytics >/dev/null
+
       - name: Install doit
         uses: awalsh128/cache-apt-pkgs-action@v1.4.2
         with:
           packages: python3-doit
 
-      - name: Run analyzer
-        run: doit analyze
+      - name: Run dart analyzer
+        run: doit lint:dart
 
       - name: Run tests
         run: doit test
@@ -58,16 +61,31 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install Flutter
+      - name: Install JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - name: Install flutter
         uses: subosito/flutter-action@v2
         with:
           channel: stable
           cache: true
 
+      - name: Configure flutter
+        run: flutter config --no-cli-animations --no-analytics >/dev/null
+
       - name: Install doit
         uses: awalsh128/cache-apt-pkgs-action@v1.4.2
         with:
           packages: python3-doit
 
+      - name: Run dart analyzer
+        run: doit lint:dart
+
+      - name: Run spotless linter
+        run: doit lint:kotlin
+
       - name: Build apk
         run: doit build:apk
diff --git a/.gitignore b/.gitignore
index 1bd7662..b2969e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ app.*.map.json
 
 # doit related
 .doit.db*
+/dist
diff --git a/_temp_storage/app/.gitignore b/_temp_storage/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/_temp_storage/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/_temp_storage/app/build.gradle b/_temp_storage/app/build.gradle
deleted file mode 100644
index e2021ed..0000000
--- a/_temp_storage/app/build.gradle
+++ /dev/null
@@ -1,133 +0,0 @@
-def getManifestVersions = { ->
-    def manifest = new XmlSlurper().parse(file('src/main/AndroidManifest.xml'))
-    def versionName = manifest.@'android:versionName'.text()
-    def versionCode = manifest.@'android:versionCode'.text().toInteger()
-    return [versionName, versionCode]
-}
-
-def getVersionName = { ->
-    def (versionName, _) = getManifestVersions()
-    return versionName
-}
-
-def getVersionCode = { ->
-    def (_, versionCode) = getManifestVersions()
-    return versionCode
-}
-
-def validateVersion = { ->
-    def (versionName, versionCode) = getManifestVersions()
-
-    project.logger.lifecycle("Checking version name and code...")
-    project.logger.lifecycle("versionName = $versionName")
-    project.logger.lifecycle("versionCode = $versionCode")
-
-    def gitStdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'describe', '--tags', '--abbrev=0'
-        standardOutput = gitStdout
-    }
-    def versionGit = gitStdout.toString().trim().replaceAll('v', '')
-
-    if (versionName != versionGit) {
-        throw new GradleException(
-            "Mismatched android:versionName in AndroidManifest.xml and git tag: "+
-                "versionName = $versionName, "+
-                "versionGit = $versionGit")
-    }
-
-    def expectedCode = 0
-    def mult = 1
-    versionName.tokenize('.').reverse().each {
-        expectedCode += it.toInteger() * mult
-        mult *= 1000
-    }
-
-    if (versionCode != expectedCode) {
-        throw new GradleException(
-            "Mismatched android:versionName and android:versionCode in AndroidManifest.xml: "+
-                "versionName = $versionName, "+
-                "versionCode = $versionCode, "+
-                "expectedCode = $expectedCode")
-    }
-}
-
-task checkVersion {
-    doLast {
-        validateVersion()
-    }
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
-    compileSdk project.compileSdkVersion.toInteger()
-
-    ndkVersion project.ndkVersion
-
-    defaultConfig {
-        applicationId 'org.rocstreaming.rocdroid'
-
-        minSdkVersion project.minSdkVersion.toInteger()
-        targetSdkVersion project.targetSdkVersion.toInteger()
-
-        versionName getVersionName()
-        versionCode getVersionCode()
-    }
-
-    applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "roc-droid-${versionName}.apk"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
-    signingConfigs {
-        release {
-            if (System.getenv("SIGNING_STORE_FILE") != null) {
-                storeFile file(System.getenv("SIGNING_STORE_FILE"))
-                storePassword System.getenv("SIGNING_STORE_PASSWORD")
-                keyAlias System.getenv("SIGNING_KEY_ALIAS")
-                keyPassword System.getenv("SIGNING_KEY_PASSWORD")
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
-
-            if (System.getenv("SIGNING_STORE_FILE") != null) {
-                signingConfig signingConfigs.release
-            }
-        }
-    }
-}
-
-dependencies {
-    implementation 'org.roc-streaming.roctoolkit:roc-android:0.2.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.activity:activity-ktx:1.2.4'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
-}
diff --git a/_temp_storage/app/gradle.properties b/_temp_storage/app/gradle.properties
deleted file mode 100644
index 4b7d882..0000000
--- a/_temp_storage/app/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-compileSdkVersion=29
-targetSdkVersion=29
-minSdkVersion=26
-ndkVersion=25.2.9519653
diff --git a/_temp_storage/build.gradle b/_temp_storage/build.gradle
deleted file mode 100644
index 9ff0411..0000000
--- a/_temp_storage/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.7.21'
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-plugins {
-    id "com.diffplug.spotless" version "6.12.0"
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        mavenCentral()
-    }
-}
-
-spotless {
-    format 'misc', {
-        // define the files to apply `misc` to
-        target '**/*.gradle', '**/*.md', '**/.gitignore'
-
-        // define the steps to apply to those files
-        indentWithSpaces()
-        trimTrailingWhitespace()
-        endWithNewline()
-    }
-
-    kotlin {
-        target '**/*.kt'
-        ktlint()
-        trimTrailingWhitespace()
-        indentWithSpaces()
-        endWithNewline()
-    }
-}
diff --git a/_temp_storage/gradle.properties b/_temp_storage/gradle.properties
deleted file mode 100644
index 23339e0..0000000
--- a/_temp_storage/gradle.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
diff --git a/_temp_storage/gradle/wrapper/gradle-wrapper.jar b/_temp_storage/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index f6b961f..0000000
Binary files a/_temp_storage/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/_temp_storage/gradle/wrapper/gradle-wrapper.properties b/_temp_storage/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 0e87abc..0000000
--- a/_temp_storage/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun May 31 15:05:46 MSK 2020
-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
diff --git a/_temp_storage/settings.gradle b/_temp_storage/settings.gradle
deleted file mode 100644
index ac561b5..0000000
--- a/_temp_storage/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name='roc-droid'
-include ':app'
diff --git a/android/.gitignore b/android/.gitignore
index 6f56801..8eaf34c 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,9 +1,7 @@
-gradle-wrapper.jar
 /.gradle
 /captures/
-/gradlew
-/gradlew.bat
 /local.properties
+/build
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6d6784d..2d64f2e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,3 +1,5 @@
+import org.yaml.snakeyaml.Yaml
+
 plugins {
     id "com.android.application"
     id "kotlin-android"
@@ -23,56 +25,100 @@ if (flutterVersionName == null) {
     flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+def readPubspecVersion = { ->
+    def pubspec = new Yaml().load(file("../../pubspec.yaml").text)
+    return pubspec.version
+}
+
+def readManifestVersion = { ->
+    def manifest = new XmlSlurper().parse(file("src/main/AndroidManifest.xml"))
+    return manifest.@"android:versionName".text()
+}
+
+def readManifestVersionCode = { ->
+    def manifest = new XmlSlurper().parse(file("src/main/AndroidManifest.xml"))
+    return manifest.@"android:versionCode".text().toInteger()
+}
+
+def validateVersion = { ->
+    def pubspecVersion = readPubspecVersion()
+    def manifestVersion = readManifestVersion()
+
+    project.logger.lifecycle("Checking version name and code...")
+    project.logger.lifecycle("pubspecVersion = $pubspecVersion")
+    project.logger.lifecycle("manifestVersion = $manifestVersion")
+
+    if (pubspecVersion != manifestVersion) {
+        throw new GradleException(
+            "Mismatched versions in pubspec.yaml and AndroidManifest.xml:"+
+                "\n  pubspecVersion = $pubspecVersion"+
+                "\n  manifestVersion = $manifestVersion")
+    }
+}
+
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
 
 android {
     namespace = "org.rocstreaming.rocdroid"
-    compileSdk = flutter.compileSdkVersion
+
+    compileSdk = project.compileSdkVersion.toInteger()
     ndkVersion = flutter.ndkVersion
 
+    defaultConfig {
+        applicationId = "org.rocstreaming.rocdroid"
+
+        targetSdkVersion = project.targetSdkVersion.toInteger()
+        minSdkVersion = project.minSdkVersion.toInteger()
+
+        versionName readManifestVersion()
+        versionCode readManifestVersionCode()
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 
-    defaultConfig {
-        applicationId = "org.rocstreaming.rocdroid"
-        // You can update the following values to match your application needs.
-        // For more information, see:
-        // https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration
-        minSdk = flutter.minSdkVersion
-        targetSdk = flutter.targetSdkVersion
-        versionCode = flutterVersionCode.toInteger()
-        versionName = flutterVersionName
-        minSdkVersion = 26
+    composeOptions {
+        kotlinCompilerExtensionVersion "1.4.0"
+    }
+
+    lintOptions {
+        abortOnError false
     }
 
-    applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "roc-droid.apk"
+    signingConfigs {
+        release {
+            if (System.getenv("SIGNING_STORE_FILE") != null) {
+                storeFile file(System.getenv("SIGNING_STORE_FILE"))
+                storePassword System.getenv("SIGNING_STORE_PASSWORD")
+                keyAlias System.getenv("SIGNING_KEY_ALIAS")
+                keyPassword System.getenv("SIGNING_KEY_PASSWORD")
+            }
         }
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.debug
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt")
+
+            if (System.getenv("SIGNING_STORE_FILE") != null) {
+                signingConfig signingConfigs.release
+            }
         }
     }
 
     // https://android.izzysoft.de/articles/named/iod-scan-apkchecks#blobs
     // https://gist.github.com/obfusk/31c332b884464cd8aa06ce1ba1583c05
     dependenciesInfo {
-        // Disables dependency metadata when building APKs.
         includeInApk = false
-        // Disables dependency metadata when building Android App Bundles.
         includeInBundle = false
     }
 }
@@ -82,14 +128,28 @@ flutter {
 }
 
 dependencies {
-    implementation 'org.roc-streaming.roctoolkit:roc-android:0.2.1'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.activity:activity-ktx:1.9.2'
-    implementation 'androidx.fragment:fragment-ktx:1.3.6'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.25'
+    // kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    // androidx
+    implementation "androidx.core:core-ktx:1.9.0"
+    implementation "androidx.activity:activity-ktx:1.9.2"
+    implementation "androidx.fragment:fragment-ktx:1.8.4"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+    implementation "androidx.viewpager2:viewpager2:1.1.0"
+    // flutter
+    implementation "com.google.android.material:material:1.3.0"
+    implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.25"
+    // roc
+    implementation "org.roc-streaming.roctoolkit:roc-android:0.2.1"
+}
+
+task validateVersionTask {
+    doLast {
+        validateVersion()
+    }
+}
+
+tasks.matching { it.name.startsWith("assemble") }.configureEach {
+    dependsOn validateVersionTask
 }
diff --git a/android/app/gradle.properties b/android/app/gradle.properties
new file mode 100644
index 0000000..446173b
--- /dev/null
+++ b/android/app/gradle.properties
@@ -0,0 +1,6 @@
+# android 12
+compileSdkVersion=34
+# android 10
+targetSdkVersion=29
+# android 10
+minSdkVersion=29
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d7f1759..b93e98e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.rocstreaming.rocdroid"
-    android:versionCode="3000"
-    android:versionName="0.3.0">
+          package="org.rocstreaming.rocdroid"
+          android:versionCode="4000"
+          android:versionName="0.4.0">
+  <!-- Numbers above are updated automatically by update_version.py and make_tag.py.
+       Version here should match version from pubspec.yaml, otherwise build fails. -->
 
     <!-- For sreaming -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -14,52 +17,62 @@
     <!-- For sender, when capturing sound from other apps -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
     <!-- To create notification from sender -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application
-        android:label="Roc Droid"
-        android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon">
-        <service
-            android:name=".StreamingService"
-            android:exported="false"
-            android:foregroundServiceType="mediaProjection" />
-        <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"
-            android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+      android:label="Roc Droid"
+      android:name="${applicationName}"
+      android:icon="@mipmap/launcher_icon">
+
+      <service
+        android:name=".StreamingService"
+        android:exported="false"
+        android:foregroundServiceType="mediaProjection" />
+
+      <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"
+        android:windowSoftInputMode="adjustResize">
+
+        <!-- Specifies an Android theme to apply to this Activity as soon as
+             the Android process has started. This theme is visible to the user
+             while the Flutter UI initializes. After that, this theme continues
+             to determine the Window background behind the Flutter UI. -->
         <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
+          android:name="io.flutter.embedding.android.NormalTheme"
+          android:resource="@style/NormalTheme"
+          />
+
+        <intent-filter>
+          <action android:name="android.intent.action.MAIN"/>
+          <category android:name="android.intent.category.LAUNCHER"/>
+        </intent-filter>
+
+      </activity>
+
+      <!-- Don't delete the meta-data below.
+           This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+      <meta-data
+        android:name="flutterEmbedding"
+        android:value="2" />
+
     </application>
+
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+         In particular, this is used by the Flutter engine in
+         io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
-        </intent>
+      <intent>
+        <action android:name="android.intent.action.PROCESS_TEXT"/>
+        <data android:mimeType="text/plain"/>
+      </intent>
     </queries>
+
 </manifest>
diff --git a/android/app/src/main/java/org/rocstreaming/rocdroid/AndroidConnectorImpl.kt b/android/app/src/main/java/org/rocstreaming/rocdroid/AndroidConnectorImpl.kt
index 3db737d..05adf9c 100644
--- a/android/app/src/main/java/org/rocstreaming/rocdroid/AndroidConnectorImpl.kt
+++ b/android/app/src/main/java/org/rocstreaming/rocdroid/AndroidConnectorImpl.kt
@@ -8,8 +8,6 @@ import android.Manifest
 import android.media.projection.MediaProjection
 import android.util.Log
 import java.net.NetworkInterface
-import org.rocstreaming.rocdroid.MainActivity
-import org.rocstreaming.rocdroid.StreamingService
 
 private const val BAD_SEQUENCE_CODE = "rocdroid.BAD_SEQUENCE"
 private const val BAD_SEQUENCE_TEXT = "Invalid method invocation sequence"
@@ -30,7 +28,7 @@ private const val LOG_TAG = "rocdroid.AndroidConnectorImpl"
 class AndroidConnectorImpl : AndroidConnector {
     private var projectionAcquired: Boolean = false
 
-    fun getActivity() : MainActivity {
+    fun getActivity(): MainActivity {
         return MainActivity.instance
     }
 
@@ -62,7 +60,8 @@ class AndroidConnectorImpl : AndroidConnector {
 
                 Log.d(LOG_TAG, "Permission request succeeded")
                 callback(Result.success(true))
-            })
+            }
+        )
     }
 
     override fun requestMicrophone(callback: (Result<Boolean>) -> Unit) {
@@ -81,7 +80,8 @@ class AndroidConnectorImpl : AndroidConnector {
 
                 Log.d(LOG_TAG, "Permission request succeeded")
                 callback(Result.success(true))
-            })
+            }
+        )
     }
 
     override fun acquireProjection(callback: (Result<Boolean>) -> Unit) {
@@ -122,7 +122,7 @@ class AndroidConnectorImpl : AndroidConnector {
     }
 
     override fun releaseProjection() {
-       Log.i(LOG_TAG, "Releasing media projection")
+        Log.i(LOG_TAG, "Releasing media projection")
 
         if (!projectionAcquired) {
             Log.e(LOG_TAG, "Unpaired acquireProjection/releaseProjection calls")
@@ -203,7 +203,8 @@ class AndroidConnectorImpl : AndroidConnector {
         }
 
         if (settings.captureType == AndroidCaptureType.CAPTURE_MIC &&
-              !getActivity().hasPermission(Manifest.permission.RECORD_AUDIO)) {
+            !getActivity().hasPermission(Manifest.permission.RECORD_AUDIO)
+        ) {
             Log.e(LOG_TAG, "Microphone permission must be granted when using CAPTURE_MIC")
             throw FlutterError(NO_PERMISSION_CODE, NO_PERMISSION_TEXT)
         }
diff --git a/android/app/src/main/java/org/rocstreaming/rocdroid/MainActivity.kt b/android/app/src/main/java/org/rocstreaming/rocdroid/MainActivity.kt
index 2b0ab66..6cc3ab9 100644
--- a/android/app/src/main/java/org/rocstreaming/rocdroid/MainActivity.kt
+++ b/android/app/src/main/java/org/rocstreaming/rocdroid/MainActivity.kt
@@ -14,7 +14,6 @@ import android.media.projection.MediaProjectionManager
 import android.os.Bundle
 import android.os.IBinder
 import android.util.Log
-import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -22,23 +21,20 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine
-import org.rocstreaming.rocdroid.AndroidConnectorImpl
-import org.rocstreaming.rocdroid.StreamingEventListener
-import org.rocstreaming.rocdroid.StreamingService
 
 private const val LOG_TAG = "rocdroid.MainActivity"
 
-class MainActivity: FlutterFragmentActivity() {
+class MainActivity : FlutterFragmentActivity() {
     // main activity is a singleton used by AndroidConnectorImpl
     companion object {
-        lateinit var instance : MainActivity
+        lateinit var instance: MainActivity
     }
 
     // non-null once successfully connected to server
     // may temporarily become null when connection is lost
     private var service: StreamingService? = null
 
-    fun getService() : StreamingService? {
+    fun getService(): StreamingService? {
         return service
     }
 
@@ -68,8 +64,10 @@ class MainActivity: FlutterFragmentActivity() {
         // AndroidConnector interface is generated by pigeon and is called from dart
         // AndroidConnectorImpl implements its methods
         // here we link them together
-        AndroidConnector.setUp(flutterEngine.dartExecutor.binaryMessenger,
-                               AndroidConnectorImpl())
+        AndroidConnector.setUp(
+            flutterEngine.dartExecutor.binaryMessenger,
+            AndroidConnectorImpl()
+        )
 
         // AndroidListener class is generated by pigeon and allows kotlin to
         // invoke dart methods
@@ -86,12 +84,16 @@ class MainActivity: FlutterFragmentActivity() {
 
         // setup for permission requests
         permissionRequestLauncher = registerForActivityResult(
-            ActivityResultContracts.RequestPermission(), this::onPermissionResult)
+            ActivityResultContracts.RequestPermission(),
+            this::onPermissionResult
+        )
 
         // setup for projection request
         projectionManager = getSystemService(MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
         projectionRequestLauncher = registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult(), this::onProjectionResult)
+            ActivityResultContracts.StartActivityForResult(),
+            this::onProjectionResult
+        )
     }
 
     // when app is resumed
@@ -127,7 +129,7 @@ class MainActivity: FlutterFragmentActivity() {
         serviceStartedCallback = callback
 
         val serviceIntent = Intent(this, StreamingService::class.java)
-        startForegroundService(serviceIntent);
+        startForegroundService(serviceIntent)
         bindService(serviceIntent, serviceConnection, BIND_AUTO_CREATE)
     }
 
@@ -174,7 +176,7 @@ class MainActivity: FlutterFragmentActivity() {
             // (re)start & reconnect
             Log.d(LOG_TAG, "Initiating asynchronous reconnect")
             val serviceIntent = Intent(this@MainActivity, StreamingService::class.java)
-            startForegroundService(serviceIntent);
+            startForegroundService(serviceIntent)
             bindService(serviceIntent, this, BIND_AUTO_CREATE)
         }
     }
@@ -190,12 +192,12 @@ class MainActivity: FlutterFragmentActivity() {
 
     private fun onProjectionResult(result: ActivityResult) {
         if (result.data != null) {
-            Log.d(LOG_TAG, "Media projection acquired with code " + result.resultCode.toString());
+            Log.d(LOG_TAG, "Media projection acquired with code " + result.resultCode.toString())
             val projection = projectionManager.getMediaProjection(result.resultCode, result.data!!)
             projectionRequestCallback?.invoke(projection)
             projectionRequestCallback = null
         } else {
-            Log.d(LOG_TAG, "Media projection rejected with code " + result.resultCode.toString());
+            Log.d(LOG_TAG, "Media projection rejected with code " + result.resultCode.toString())
             projectionRequestCallback?.invoke(null)
             projectionRequestCallback = null
         }
@@ -239,9 +241,9 @@ class MainActivity: FlutterFragmentActivity() {
 
     private fun onPermissionResult(isGranted: Boolean) {
         if (isGranted) {
-            Log.d(LOG_TAG, "Permission is granted");
+            Log.d(LOG_TAG, "Permission is granted")
         } else {
-            Log.w(LOG_TAG, "Permission is rejected");
+            Log.w(LOG_TAG, "Permission is rejected")
         }
         permissionRequestCallback?.invoke(isGranted)
         permissionRequestCallback = null
diff --git a/android/app/src/main/java/org/rocstreaming/rocdroid/StreamingService.kt b/android/app/src/main/java/org/rocstreaming/rocdroid/StreamingService.kt
index 7ac3358..d9acd63 100644
--- a/android/app/src/main/java/org/rocstreaming/rocdroid/StreamingService.kt
+++ b/android/app/src/main/java/org/rocstreaming/rocdroid/StreamingService.kt
@@ -24,8 +24,6 @@ import android.media.projection.MediaProjection
 import android.os.Binder
 import android.os.IBinder
 import android.util.Log
-import org.rocstreaming.rocdroid.MainActivity
-import org.rocstreaming.rocdroid.R
 import org.rocstreaming.roctoolkit.ChannelSet
 import org.rocstreaming.roctoolkit.ClockSource
 import org.rocstreaming.roctoolkit.Endpoint
@@ -387,16 +385,20 @@ class StreamingService : Service() {
                         sender.connect(
                             Slot.DEFAULT,
                             Interface.AUDIO_SOURCE,
-                            Endpoint(Protocol.RTP_RS8M_SOURCE,
-                                     settings.host,
-                                     settings.sourcePort.toInt())
+                            Endpoint(
+                                Protocol.RTP_RS8M_SOURCE,
+                                settings.host,
+                                settings.sourcePort.toInt()
+                            )
                         )
                         sender.connect(
                             Slot.DEFAULT,
                             Interface.AUDIO_REPAIR,
-                            Endpoint(Protocol.RS8M_REPAIR,
-                                     settings.host,
-                                     settings.repairPort.toInt())
+                            Endpoint(
+                                Protocol.RS8M_REPAIR,
+                                settings.host,
+                                settings.repairPort.toInt()
+                            )
                         )
                     } catch (e: Exception) {
                         Log.e(LOG_TAG, "Failed to connect sender: " + e.toString())
@@ -456,16 +458,20 @@ class StreamingService : Service() {
                         receiver.bind(
                             Slot.DEFAULT,
                             Interface.AUDIO_SOURCE,
-                            Endpoint(Protocol.RTP_RS8M_SOURCE,
-                                     "0.0.0.0",
-                                     settings.sourcePort.toInt())
+                            Endpoint(
+                                Protocol.RTP_RS8M_SOURCE,
+                                "0.0.0.0",
+                                settings.sourcePort.toInt()
+                            )
                         )
                         receiver.bind(
                             Slot.DEFAULT,
                             Interface.AUDIO_REPAIR,
-                            Endpoint(Protocol.RS8M_REPAIR,
-                                     "0.0.0.0",
-                                     settings.repairPort.toInt())
+                            Endpoint(
+                                Protocol.RS8M_REPAIR,
+                                "0.0.0.0",
+                                settings.repairPort.toInt()
+                            )
                         )
                     } catch (e: Exception) {
                         Log.e(LOG_TAG, "Failed to bind receiver: " + e.toString())
@@ -482,7 +488,6 @@ class StreamingService : Service() {
                     }
                 }
             }
-
         } finally {
             Log.d(LOG_TAG, "Releasing receiver resources")
 
@@ -654,7 +659,7 @@ class StreamingService : Service() {
             // when notification is tapped
             setContentIntent(pendingContentIntent)
             // when notification is swiped away
-            setDeleteIntent(pendingDeleteIntent);
+            setDeleteIntent(pendingDeleteIntent)
             // don't allow to dimiss notification on lock screen
             setOngoing(true)
             // show on lock screen
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index 2df1a97..3518933 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+  <!-- Theme applied to the Android Window while the process is starting when the
+       OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
@@ -13,7 +14,6 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index dbc9ea9..e9c2c0e 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+  <!-- Theme applied to the Android Window while the process is starting when the
+       OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
@@ -14,7 +15,6 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index dbdf6f9..900e594 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+  <!-- Theme applied to the Android Window while the process is starting when the
+       OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
@@ -13,7 +14,6 @@
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/build.gradle b/android/build.gradle
index 9c6a893..b27cb68 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,20 +1,43 @@
 buildscript {
-    ext.kotlin_version = '1.7.21'
+    ext {
+        // Compatibility tables:
+        //   https://docs.gradle.org/current/userguide/compatibility.html
+        //   https://developer.android.com/build/releases/gradle-plugin
+        //   https://kotlinlang.org/docs/gradle-configure-project.html
+        //
+        // Related packages (must be updated together):
+        //   org.jetbrains.kotlin:kotlin-gradle-plugin (build.gradle)
+        //   com.android.tools.build:gradle (build.gradle)
+        //   com.android.application (settings.gradle)
+        //   org.jetbrains.kotlin.android (settings.gradle)
+        //   kotlinCompilerExtensionVersion (app/build.gradle)
+        //   org.jetbrains.kotlin:kotlin-stdlib (app/build.gradle)
+        //   androidx.*-ktx (app/build.gradle)
+        //
+        // Gradle version is defined here:
+        //   gradle/wrapper/gradle-wrapper.properties => distributionUrl
+        kotlin_version = "1.8.0"
+    }
 
     repositories {
         google()
         mavenCentral()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "com.android.tools.build:gradle:8.0.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.yaml:snakeyaml:2.2"
     }
 }
 
+plugins {
+    id "com.diffplug.spotless" version "6.12.0"
+}
+
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
@@ -26,15 +49,28 @@ subprojects {
 subprojects {
     project.evaluationDependsOn(":app")
 }
-
 subprojects {
     beforeEvaluate { project ->
         if (project.name == "flutter_localization") {
-            project.buildscript.dependencies.classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
+            project.buildscript.dependencies.classpath \
+                "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         }
     }
 }
 
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+spotless {
+    format "misc", {
+        target "**/*.gradle", "**/*.xml"
+        indentWithSpaces()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    kotlin {
+        target "**/*.kt"
+        targetExclude "**/*.g.kt"
+        ktlint()
+        trimTrailingWhitespace()
+        indentWithSpaces()
+        endWithNewline()
+    }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 745316c..07228ce 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,16 @@
+# Project-wide Gradle settings.
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+
+# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-minSdkVersion=26
-compileSdkVersion=33
+
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100755
index 0000000..13372ae
Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 5af0f53..8bc9958 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/_temp_storage/gradlew b/android/gradlew
old mode 100644
new mode 100755
similarity index 84%
rename from _temp_storage/gradlew
rename to android/gradlew
index cccdd3d..9d82f78
--- a/_temp_storage/gradlew
+++ b/android/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -6,38 +6,20 @@
 ##
 ##############################################################################
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn () {
+warn ( ) {
     echo "$*"
 }
 
-die () {
+die ( ) {
     echo
     echo "$*"
     echo
@@ -48,7 +30,6 @@ die () {
 cygwin=false
 msys=false
 darwin=false
-nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -59,11 +40,26 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -89,7 +85,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -154,19 +150,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/_temp_storage/gradlew.bat b/android/gradlew.bat
old mode 100644
new mode 100755
similarity index 88%
rename from _temp_storage/gradlew.bat
rename to android/gradlew.bat
index e95643d..aec9973
--- a/_temp_storage/gradlew.bat
+++ b/android/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,9 +46,10 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/android/settings.gradle b/android/settings.gradle
index 536165d..5f104b7 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.0" apply false
 }
 
 include ":app"
diff --git a/dodo.py b/dodo.py
index f707271..b5d26a9 100644
--- a/dodo.py
+++ b/dodo.py
@@ -1,13 +1,18 @@
 from doit import get_var
 from doit.tools import title_with_actions, LongRunning, Interactive
 import atexit
+import fnmatch
 import glob
 import os
+import pathlib
+import platform
 import platform
 import shutil
 import signal
 import subprocess
 import sys
+import xml.etree.ElementTree
+import yaml
 
 atexit.register(
     lambda: shutil.rmtree('__pycache__', ignore_errors=True))
@@ -15,14 +20,36 @@
     signal.signal(signal.SIGINT, lambda s, f: exit(1))
 
 DOIT_CONFIG = {
-    'default_tasks': ['analyze', 'test'],
+    'default_tasks': ['lint', 'test'],
     'verbosity': 2,
 }
 
 VARIANT = get_var('variant', 'release')
 WATCH = get_var('watch', 'false')
 
-# Delete all files matching glob pattern.
+def _pubspec_version():
+    with open('pubspec.yaml') as fp:
+        spec = yaml.safe_load(fp)
+        return spec['version']
+
+def _android_version():
+    with open('android/app/src/main/AndroidManifest.xml') as fp:
+        root = xml.etree.ElementTree.fromstring(fp.read())
+        return root.attrib['{http://schemas.android.com/apk/res/android}versionName']
+
+def _gradlew():
+    if platform.system() == 'Windows':
+        return 'gradlew.bat'
+    else:
+        return 'gradlew'
+
+def _copy_file(src, dst):
+    def task():
+        print(f'\nCopying {src}\n     to {dst}', file=sys.stderr)
+        os.makedirs(os.path.dirname(dst), exist_ok=True)
+        shutil.copy2(src, dst)
+    return task
+
 def _delete_files(pattern):
     def task():
         for path in glob.glob(pattern):
@@ -33,18 +60,37 @@ def task():
                 os.remove(path)
     return task
 
-# doit analyze
-def task_analyze():
+# doit lint
+def task_lint():
+    """run all linters"""
+    return {
+        'basename': 'lint',
+        'actions': None,
+        'task_dep': ['lint:dart', 'lint:kotlin'],
+    }
+
+# doit lint:dart
+def task_lint_dart():
     """run dart analyzer"""
     return {
+        'basename': 'lint:dart',
         'actions': ['flutter analyze --fatal-infos --fatal-warnings'],
         'title': title_with_actions,
     }
 
+# doit lint:kotlin
+def task_lint_kotlin():
+    """run spotless linter"""
+    return {
+        'basename': 'lint:kotlin',
+        'actions': [f'cd android && ./{_gradlew()} spotlessCheck'],
+    }
+
 # doit test
 def task_test():
     """run tests"""
     return {
+        'basename': 'test',
         'actions': ['flutter test -j1 -r expanded'],
         'title': title_with_actions,
     }
@@ -52,15 +98,16 @@ def task_test():
 # doit launch [variant=debug|release]
 def task_launch():
     """deploy and run on device"""
-    def do_cleanup():
+    def _do_cleanup():
         subprocess.call(
             'adb shell am force-stop org.rocstreaming.rocdroid',
             shell=True)
-    def register_cleanup():
-        atexit.register(do_cleanup)
+    def _register_cleanup():
+        atexit.register(_do_cleanup)
     return {
+        'basename': 'launch',
         'actions': [
-            register_cleanup,
+            _register_cleanup,
             Interactive(f'flutter run --{VARIANT}'),
         ],
         'title': title_with_actions,
@@ -80,7 +127,13 @@ def task_build_apk():
     """build android apk"""
     return {
         'basename': 'build:apk',
-        'actions': [f'flutter build apk --{VARIANT}'],
+        'actions': [
+            f'flutter build apk --{VARIANT}',
+            _copy_file(
+                f'build/app/outputs/flutter-apk/app-{VARIANT}.apk',
+                f'dist/android/{VARIANT}/roc-droid-{_android_version()}.apk'
+            ),
+        ],
         'title': title_with_actions,
     }
 
@@ -88,9 +141,11 @@ def task_build_apk():
 def task_wipe():
     """remove all build artifacts"""
     return {
+        'basename': 'wipe',
         'actions': [
             'flutter clean',
             _delete_files('android/.gradle'),
+            _delete_files('android/build'),
         ],
         'title': title_with_actions,
     }
@@ -143,3 +198,36 @@ def task_gen_splash():
         'actions': ['dart run flutter_native_splash:create '],
         'title': title_with_actions,
     }
+
+# doit fmt
+def task_fmt():
+    """run all code formatters"""
+    return {
+        'basename': 'fmt',
+        'actions': None,
+        'task_dep': ['fmt:dart', 'fmt:kotlin'],
+    }
+
+# doit fmt:dart
+def task_fmt_dart():
+    """run dart code formatter"""
+    def _is_ignored(path):
+        if fnmatch.fnmatch(path.name, '*.g.dart'):
+            return True
+        return False
+    files = list(sorted(
+        map(str,
+            filter(lambda x: not _is_ignored(x),
+                   pathlib.Path('lib').rglob('*.dart')))))
+    return {
+        'basename': 'fmt:dart',
+        'actions': [['dart', 'format', *files]],
+    }
+
+# doit fmt:kotlin
+def task_fmt_kotlin():
+    """run spotless formatter"""
+    return {
+        'basename': 'fmt:kotlin',
+        'actions': [f'cd android && ./{_gradlew()} spotlessApply'],
+    }
diff --git a/pubspec.yaml b/pubspec.yaml
index 84ecbfe..5300f8c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,7 @@
 name: roc_droid
 description: "Roc for Android!"
 publish_to: 'none'
-version: 0.3.0
-
+version: 0.4.0
 environment:
   sdk: '>=3.4.3 <4.0.0'
 
diff --git a/script/make_tag.py b/script/make_tag.py
index 0880b88..3cb2c84 100755
--- a/script/make_tag.py
+++ b/script/make_tag.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python3
+#! /usr/bin/env python3
+
 import argparse
 import os
 import re
@@ -18,27 +19,25 @@ def check_tag_exists(tag):
         return False
 
 def write_version(version):
-    print(f'--- Updating version in app/src/main/AndroidManifest.xml to {version}')
-    major, minor, patch = map(int, version.split('.'))
-    version_code = 1000000*major + 1000*minor + patch
-    version_name_line = re.compile(r'\bandroid:versionName=".*"')
-    version_code_line = re.compile(r'\bandroid:versionCode=".*"')
-    with fileinput.FileInput('app/src/main/AndroidManifest.xml', inplace=True) as f:
-        for line in f:
-            line = version_name_line.sub(f'android:versionName="{version}"', line)
-            print(version_code_line.sub(f'android:versionCode="{version_code}"', line), end='')
-
+    print(f'--- Updating version to {version}')
+    subprocess.check_call([sys.executable, 'script/update_version.py', version])
 
 def run_command(args):
     print(f'--- Running command: {" ".join(args)}')
     subprocess.check_call(args)
 
 def check_version_to_commit():
-    cmd = ['git', 'diff', '--cached', 'app/src/main/AndroidManifest.xml']
+    cmd = ['git',
+           'diff', '--cached',
+           'pubspec.yml',
+           'android/app/src/main/AndroidManifest.xml']
     return subprocess.check_output(cmd) != b''
 
 def commit_change(version):
-    run_command(['git', 'add', 'app/src/main/AndroidManifest.xml'])
+    run_command(['git',
+                 'add',
+                 'pubspec.yml',
+                 'android/app/src/main/AndroidManifest.xml'])
     if not check_version_to_commit():
         print('--- Version did not change, nothing to commit')
         return
diff --git a/script/update_version.py b/script/update_version.py
new file mode 100755
index 0000000..497cc1e
--- /dev/null
+++ b/script/update_version.py
@@ -0,0 +1,40 @@
+#! /usr/bin/env python3
+
+import fileinput
+import os
+import re
+import sys
+import yaml
+
+PUBSPEC_FILE = 'pubspec.yaml'
+MANIFEST_FILE = 'android/app/src/main/AndroidManifest.xml'
+
+os.chdir(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), '..'))
+
+if len(sys.argv) != 2:
+    print(f'Usage: script/update_version.py 1.2.3')
+    exit(1)
+
+version = sys.argv[1]
+major, minor, patch = map(int, version.split('.'))
+version_code = 1000000*major + 1000*minor + patch
+
+print(f'Version: {version}, version code: {version_code}')
+
+print(f'Updating {PUBSPEC_FILE}')
+
+with fileinput.FileInput(PUBSPEC_FILE, inplace=True) as fp:
+    for line in fp:
+        line = re.sub(r'^version:\s*\S+\s*$', f'version: {version}\n', line)
+        print(line, end='')
+
+print(f'Updating {MANIFEST_FILE}')
+
+with fileinput.FileInput(MANIFEST_FILE, inplace=True) as fp:
+    for line in fp:
+        line = re.sub(r'\bandroid:versionName=".*"', f'android:versionName="{version}"', line)
+        line = re.sub(r'\bandroid:versionCode=".*"', f'android:versionCode="{version_code}"', line)
+        print(line, end='')
+
+print(f'Done.')