Skip to content

Commit 970da72

Browse files
committed
Merge remote-tracking branch 'origin/master' into renovate/just_audio-0.x
2 parents a284ff1 + ad3938d commit 970da72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+399
-378
lines changed

.github/workflows/flutter.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
fetch-depth: 0 # for SonarCloud
2626

27-
- uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
27+
- uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
2828
if: github.base_ref
2929

3030
- name: Setup Flutter
@@ -48,6 +48,6 @@ jobs:
4848
name: failures
4949
path: "**/failures/"
5050

51-
- uses: SonarSource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97 # v5.1.0
51+
- uses: SonarSource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
5252
env:
5353
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/integration_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
flutter build apk --config-only
4040
patrol build android --verbose --target integration_test/auto_resize_test.dart
4141
42-
- uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
42+
- uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
4343
with:
4444
credentials_json: ${{ secrets.FIREBASE_TEST_LAB_CREDENTIALS_JSON }}
4545
- uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
@@ -89,7 +89,7 @@ jobs:
8989
cd demo_app/ios
9090
fastlane patrol_build
9191
92-
- uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
92+
- uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
9393
with:
9494
credentials_json: ${{ secrets.FIREBASE_TEST_LAB_CREDENTIALS_JSON }}
9595
- uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4

demo_app/.metadata

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819"
7+
revision: "077b4a4ce10a07b82caa6897f0c626f9c0a3ac90"
88
channel: "stable"
99

1010
project_type: app
@@ -13,20 +13,20 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
17-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
16+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
17+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
1818
- platform: android
19-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
20-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
19+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
20+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2121
- platform: ios
22-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
23-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
22+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
23+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2424
- platform: macos
25-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
26-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
25+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
26+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
2727
- platform: web
28-
create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
29-
base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
28+
create_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
29+
base_revision: 077b4a4ce10a07b82caa6897f0c626f9c0a3ac90
3030

3131
# User provided section
3232

demo_app/android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/to/reference-keystore
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
2+
id("com.android.application")
3+
id("kotlin-android")
44
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
5+
id("dev.flutter.flutter-gradle-plugin")
66
}
77

88
android {
@@ -14,12 +14,12 @@ android {
1414
ndkVersion = "27.0.12077973"
1515

1616
compileOptions {
17-
sourceCompatibility = JavaVersion.VERSION_1_8
18-
targetCompatibility = JavaVersion.VERSION_1_8
17+
sourceCompatibility = JavaVersion.VERSION_11
18+
targetCompatibility = JavaVersion.VERSION_11
1919
}
2020

2121
kotlinOptions {
22-
jvmTarget = JavaVersion.VERSION_1_8
22+
jvmTarget = JavaVersion.VERSION_11.toString()
2323
}
2424

2525
defaultConfig {
@@ -32,31 +32,31 @@ android {
3232
versionName = flutter.versionName
3333

3434
// https://patrol.leancode.co/getting-started
35-
testInstrumentationRunner "pl.leancode.patrol.PatrolJUnitRunner"
36-
testInstrumentationRunnerArguments clearPackageData: "true"
35+
testInstrumentationRunner = "pl.leancode.patrol.PatrolJUnitRunner"
36+
testInstrumentationRunnerArguments["clearPackageData"] = "true"
3737
}
3838

3939
signingConfigs {
40-
demo {
41-
storeFile file("../keystore")
42-
storePassword "storepass"
43-
keyAlias "alias"
44-
keyPassword "keypass"
40+
create("demo") {
41+
storeFile = file("../keystore")
42+
storePassword = "storepass"
43+
keyAlias = "alias"
44+
keyPassword = "keypass"
4545
}
4646
}
4747

4848
buildTypes {
4949
debug {
50-
signingConfig = signingConfigs.demo
50+
signingConfig = signingConfigs.getByName("demo")
5151
}
5252
release {
53-
signingConfig = signingConfigs.demo
53+
signingConfig = signingConfigs.getByName("demo")
5454
}
5555
}
5656

5757
testOptions {
5858
// https://patrol.leancode.co/getting-started
59-
execution "ANDROIDX_TEST_ORCHESTRATOR"
59+
execution = "ANDROIDX_TEST_ORCHESTRATOR"
6060
}
6161
}
6262

@@ -66,5 +66,5 @@ flutter {
6666

6767
dependencies {
6868
// https://patrol.leancode.co/getting-started
69-
androidTestUtil "androidx.test:orchestrator:1.5.1"
69+
androidTestUtil("androidx.test:orchestrator:1.5.1")
7070
}

demo_app/android/build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

demo_app/android/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
allprojects {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
}
6+
}
7+
8+
val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
9+
rootProject.layout.buildDirectory.value(newBuildDir)
10+
11+
subprojects {
12+
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
13+
project.layout.buildDirectory.value(newSubprojectBuildDir)
14+
}
15+
subprojects {
16+
project.evaluationDependsOn(":app")
17+
}
18+
19+
tasks.register<Delete>("clean") {
20+
delete(rootProject.layout.buildDirectory)
21+
}

demo_app/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

demo_app/android/settings.gradle

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
pluginManagement {
2+
val flutterSdkPath = run {
3+
val properties = java.util.Properties()
4+
file("local.properties").inputStream().use { properties.load(it) }
5+
val flutterSdkPath = properties.getProperty("flutter.sdk")
6+
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
7+
flutterSdkPath
8+
}
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
18+
19+
plugins {
20+
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21+
id("com.android.application") version "8.7.3" apply false
22+
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
23+
}
24+
25+
include(":app")

0 commit comments

Comments
 (0)