Skip to content

Commit 3711ff2

Browse files
gspencergooggspencergoog
authored
Update a pubspec and platform runners (#250)
## Description This updates a pubspec, all of the platform runners in the two packages that have platform directories. The diagrams are updated separately in #251 including the contents of this change.
1 parent 5da3306 commit 3711ff2

File tree

71 files changed

+170
-597
lines changed

Some content is hidden

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

71 files changed

+170
-597
lines changed

‎packages/diagram_capture/example/macos/Flutter/GeneratedPluginRegistrant.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import FlutterMacOS
66
import Foundation
77

8-
import path_provider_macos
8+
import path_provider_foundation
99

1010
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1111
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

‎packages/diagram_generator/.metadata

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "f808aaa12f3a32d316f0ee476ffc24502f7c3d25"
8-
channel: "main"
7+
revision: "ae21cab10dbc31da261568ef9a814a02c44b1410"
8+
channel: "[user-branch]"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
17-
base_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
16+
create_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
17+
base_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
1818
- platform: android
19-
create_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
20-
base_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
19+
create_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
20+
base_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
2121
- platform: ios
22-
create_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
23-
base_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
22+
create_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
23+
base_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
2424
- platform: linux
25-
create_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
26-
base_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
25+
create_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
26+
base_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
2727
- platform: macos
28-
create_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
29-
base_revision: f808aaa12f3a32d316f0ee476ffc24502f7c3d25
28+
create_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
29+
base_revision: ae21cab10dbc31da261568ef9a814a02c44b1410
3030

3131
# User provided section
3232

‎packages/diagram_generator/android/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
1212
**/*.keystore
1313
**/*.jks

‎packages/diagram_generator/android/app/build.gradle

+15-42
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,44 @@
1-
// Copyright 2013 The Flutter Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
4-
51
plugins {
62
id "com.android.application"
73
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
85
id "dev.flutter.flutter-gradle-plugin"
96
}
107

11-
def localProperties = new Properties()
12-
def localPropertiesFile = rootProject.file('local.properties')
13-
if (localPropertiesFile.exists()) {
14-
localPropertiesFile.withReader('UTF-8') { reader ->
15-
localProperties.load(reader)
16-
}
17-
}
18-
19-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
20-
if (flutterVersionCode == null) {
21-
flutterVersionCode = '1'
22-
}
23-
24-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
25-
if (flutterVersionName == null) {
26-
flutterVersionName = '1.0'
27-
}
28-
298
android {
30-
namespace "dev.flutter.diagram_generator"
31-
compileSdk flutter.compileSdkVersion
32-
ndkVersion flutter.ndkVersion
9+
namespace = "dev.flutter.diagram_generator"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
3312

3413
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_8
36-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
3716
}
3817

3918
kotlinOptions {
40-
jvmTarget = '1.8'
41-
}
42-
43-
sourceSets {
44-
main.java.srcDirs += 'src/main/kotlin'
19+
jvmTarget = JavaVersion.VERSION_1_8
4520
}
4621

4722
defaultConfig {
4823
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
49-
applicationId "dev.flutter.diagram_generator"
24+
applicationId = "dev.flutter.diagram_generator"
5025
// You can update the following values to match your application needs.
51-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
52-
minSdkVersion flutter.minSdkVersion
53-
targetSdkVersion flutter.targetSdkVersion
54-
versionCode flutterVersionCode.toInteger()
55-
versionName flutterVersionName
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
5631
}
5732

5833
buildTypes {
5934
release {
6035
// TODO: Add your own signing config for the release build.
6136
// Signing with the debug keys for now, so `flutter run --release` works.
62-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
6338
}
6439
}
6540
}
6641

6742
flutter {
68-
source '../..'
43+
source = "../.."
6944
}
70-
71-
dependencies {}

‎packages/diagram_generator/android/app/src/debug/AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
2-
Use of this source code is governed by a BSD-style license that can be
3-
found in the LICENSE file. -->
4-
51
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
62
<!-- The INTERNET permission is required for development. Specifically,
73
the Flutter tool needs it to communicate with the running application

‎packages/diagram_generator/android/app/src/main/AndroidManifest.xml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
2-
Use of this source code is governed by a BSD-style license that can be
3-
found in the LICENSE file. -->
4-
51
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
62
<application
73
android:label="diagram_generator"
@@ -11,6 +7,7 @@ found in the LICENSE file. -->
117
android:name=".MainActivity"
128
android:exported="true"
139
android:launchMode="singleTop"
10+
android:taskAffinity=""
1411
android:theme="@style/LaunchTheme"
1512
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1613
android:hardwareAccelerated="true"
@@ -35,7 +32,7 @@ found in the LICENSE file. -->
3532
android:value="2" />
3633
</application>
3734
<!-- Required to query activities that can process text, see:
38-
https://developer.android.com/training/package-visibility?hl=en and
35+
https://developer.android.com/training/package-visibility and
3936
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
4037
4138
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

‎packages/diagram_generator/android/app/src/main/res/drawable-v21/launch_background.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
3-
Use of this source code is governed by a BSD-style license that can be
4-
found in the LICENSE file. -->
5-
62
<!-- Modify this file to customize your launch splash screen -->
73
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
84
<item android:drawable="?android:colorBackground" />

‎packages/diagram_generator/android/app/src/main/res/drawable/launch_background.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
3-
Use of this source code is governed by a BSD-style license that can be
4-
found in the LICENSE file. -->
5-
62
<!-- Modify this file to customize your launch splash screen -->
73
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
84
<item android:drawable="@android:color/white" />

‎packages/diagram_generator/android/app/src/main/res/values-night/styles.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
3-
Use of this source code is governed by a BSD-style license that can be
4-
found in the LICENSE file. -->
5-
62
<resources>
73
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
84
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">

‎packages/diagram_generator/android/app/src/main/res/values/styles.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
3-
Use of this source code is governed by a BSD-style license that can be
4-
found in the LICENSE file. -->
5-
62
<resources>
73
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
84
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">

‎packages/diagram_generator/android/app/src/profile/AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
<!-- Copyright 2013 The Flutter Authors. All rights reserved.
2-
Use of this source code is governed by a BSD-style license that can be
3-
found in the LICENSE file. -->
4-
51
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
62
<!-- The INTERNET permission is required for development. Specifically,
73
the Flutter tool needs it to communicate with the running application

‎packages/diagram_generator/android/build.gradle

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
1-
// Copyright 2013 The Flutter Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
4-
51
allprojects {
62
repositories {
73
google()
84
mavenCentral()
95
}
106
}
117

12-
rootProject.buildDir = '../build'
8+
rootProject.buildDir = "../build"
139
subprojects {
1410
project.buildDir = "${rootProject.buildDir}/${project.name}"
1511
}
1612
subprojects {
17-
project.evaluationDependsOn(':app')
13+
project.evaluationDependsOn(":app")
1814
}
1915

2016
tasks.register("clean", Delete) {

‎packages/diagram_generator/android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx4G
1+
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

‎packages/diagram_generator/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

‎packages/diagram_generator/android/settings.gradle

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
// Copyright 2013 The Flutter Authors. All rights reserved.
2-
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
4-
51
pluginManagement {
62
def flutterSdkPath = {
73
def properties = new Properties()
84
file("local.properties").withInputStream { properties.load(it) }
95
def flutterSdkPath = properties.getProperty("flutter.sdk")
106
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
117
return flutterSdkPath
12-
}
13-
settings.ext.flutterSdkPath = flutterSdkPath()
8+
}()
149

15-
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
1611

1712
repositories {
1813
google()
@@ -23,8 +18,8 @@ pluginManagement {
2318

2419
plugins {
2520
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
26-
id "com.android.application" version "7.3.0" apply false
27-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
id "com.android.application" version "8.1.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
2823
}
2924

3025
include ":app"

‎packages/diagram_generator/ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎packages/diagram_generator/ios/Flutter/Debug.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
21
#include "Generated.xcconfig"

‎packages/diagram_generator/ios/Flutter/Release.xcconfig

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
21
#include "Generated.xcconfig"

‎packages/diagram_generator/ios/Podfile

-44
This file was deleted.

0 commit comments

Comments
 (0)