Prepare 0.7.0 release

.github/workflows/ci.yml

@@ -359,6 +359,13 @@ jobs:
                        ninja-build pkg-config xvfb
         if: ${{ matrix.platform == 'linux' }}
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin  # Temurin is cached on GitHub Actions Runners.
+          java-version: 17
+          cache: gradle
+        if: ${{ matrix.platform == 'android' }}
+
       - name: Parse Android API versions
         id: api-version
         run: |
@@ -482,6 +489,13 @@ jobs:
           tool-cache: false
         if: ${{ matrix.platform == 'android' }}
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin  # Temurin is cached on GitHub Actions Runners.
+          java-version: 17
+          cache: gradle
+        if: ${{ matrix.platform == 'android' }}
+
       - name: Enable KVM for Android HW acceleration
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \

CHANGELOG.md

@@ -6,7 +6,7 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
-## [0.7.0] · 2024-??-?? (unreleased)
+## [0.7.0] · 2024-10-29
 [0.7.0]: /../../tree/medea-jason-0.7.0
 
 [Diff](https://github.com/instrumentisto/medea-jason/compare/medea-jason-0.6.1...medea-jason-0.7.0)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "medea-jason"
-version = "0.7.0-dev"
+version = "0.7.0"
 edition = "2021"
 rust-version = "1.81"
 description = "Client library for Medea media server."
@@ -46,7 +46,7 @@ derivative = "2.2"
 derive_more = { version = "1.0", features = ["as_ref", "debug", "deref", "display", "from", "into", "mul"] }
 futures = "0.3"
 log = "0.4"
-medea-client-api-proto = { version = "0.7.0-dev", path = "proto/client-api" }
+medea-client-api-proto = { version = "0.7", path = "proto/client-api" }
 medea-macro = { version = "0.3", path = "crates/medea-macro" }
 medea-reactive = { version = "0.1", path = "crates/medea-reactive" }
 mockall = { version = "0.13", optional = true }

Makefile

@@ -30,11 +30,11 @@ ANDROID_TARGETS := aarch64-linux-android \
                    i686-linux-android \
                    x86_64-linux-android
 ANDROID_SDK_COMPILE_VERSION = $(strip \
-	$(shell grep compileSdkVersion flutter/android/build.gradle \
-	        | awk '{print $$2}'))
+	$(shell grep compileSdk flutter/android/build.gradle \
+	        | awk -F'= ' '{print $$2}' | tr -d ' '))
 ANDROID_SDK_MIN_VERSION = $(strip \
-	$(shell grep minSdkVersion flutter/android/build.gradle \
-	        | awk '{print $$2}'))
+	$(shell grep minSdk flutter/android/build.gradle \
+	        | awk -F'= ' '{print $$2}' | tr -d ' '))
 FLUTTER_RUST_BRIDGE_VER ?= $(strip \
 	$(shell grep -A1 'name = "flutter_rust_bridge"' Cargo.lock \
 	        | grep -v 'flutter_rust_bridge' \

flutter/android/build.gradle

@@ -1,40 +1,49 @@
 group 'com.medea.jason'
-version '0.7.0-dev'
+version '0.7.0'
 
 buildscript {
+    ext.kotlin_version = "1.8.22"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:" +
-                  "${ANDROID_GRADLE_PLUGIN_VERSION}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN_VERSION}"
+        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
-rootProject.allprojects {
+allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 34
+    if (project.android.hasProperty("namespace")) {
+        namespace = "com.medea.jason"
+    }
+
+    compileSdk = 34
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 24
+        minSdk = 24
     }
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${KOTLIN_VERSION}"
-}

flutter/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

flutter/example/android/app/build.gradle

@@ -1,60 +1,43 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with " +
-                              "flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdk = 34
+    namespace = "com.instrumentisto.medea_jason_example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "com.instrumentisto.medea_jason_example"
-        minSdkVersion 24
-        targetSdkVersion 30
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "com.instrumentisto.medea_jason_example"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = 24
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     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
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${KOTLIN_VERSION}"
+    source = "../.."
 }

flutter/example/android/app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">

flutter/example/android/build.gradle

@@ -1,29 +1,16 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:" +
-                  "${ANDROID_GRADLE_PLUGIN_VERSION}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN_VERSION}"
-    }
-}
-
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

flutter/example/android/gradle.properties

@@ -1,6 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-
-KOTLIN_VERSION=1.9.0
-ANDROID_GRADLE_PLUGIN_VERSION=7.4.2

flutter/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip

flutter/example/android/settings.gradle

@@ -1,12 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle" +
-            "/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

flutter/example/ios/Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
   - Flutter (1.0.0)
-  - instrumentisto-libwebrtc-bin (128.0.6613.119)
+  - instrumentisto-libwebrtc-bin (130.0.6723.69)
   - integration_test (0.0.1):
     - Flutter
-  - medea_flutter_webrtc (0.11.1):
+  - medea_flutter_webrtc (0.11.2):
     - Flutter
-    - instrumentisto-libwebrtc-bin (= 128.0.6613.119)
-  - medea_jason (0.5.0):
+    - instrumentisto-libwebrtc-bin (= 130.0.6723.69)
+  - medea_jason (0.7.0):
     - Flutter
 
 DEPENDENCIES:
@@ -31,10 +31,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  instrumentisto-libwebrtc-bin: 9504c2bb2f3c154b786fe04a5af96f482199e2c1
+  instrumentisto-libwebrtc-bin: 769972c5c8a2b370ab2d6b242180e0bba64bd5c3
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  medea_flutter_webrtc: 4d67417b7c757a5de732a09cb6caab8259d316f9
-  medea_jason: 8ae6cad8f42474e0437eb1ed230be00eacfff464
+  medea_flutter_webrtc: 2edd16f21de79901c91cd7dc3e132b3bf5af3b3a
+  medea_jason: f07b27618ffacbd5a79756000a2e335ccb5a25b6
 
 PODFILE CHECKSUM: 645e03ec353e4a50b5c4f39a89c4acce2cfd4faf
 

flutter/example/macos/Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
   - FlutterMacOS (1.0.0)
-  - medea_flutter_webrtc (0.11.1):
+  - medea_flutter_webrtc (0.11.2):
     - FlutterMacOS
-  - medea_jason (0.4.0):
+  - medea_jason (0.7.0):
     - FlutterMacOS
 
 DEPENDENCIES:
@@ -20,8 +20,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  medea_flutter_webrtc: db468951140e8752e97058b657fd5cc1d9da7791
-  medea_jason: b3355be56a78da19da91aee19a3ac56356d18997
+  medea_flutter_webrtc: 790273ab2ce7a27fd2e28c5d0f92c3ee564f6f24
+  medea_jason: 20c57bcd6ae2488ccbff0cdca2b86976dd17d899
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7