Skip to content

Commit f99dc26

Browse files
ryan-bergerryan-berger
authored
Merge pull request Sub6Resources#455 from vrtdev/fix/chewie-bump
Upgrade chewie and chewie_audio
2 parents b11dd81 + 84f547d commit f99dc26

File tree

15 files changed

+52
-189
lines changed

15 files changed

+52
-189
lines changed

‎example/android/app/src/debug/AndroidManifest.xml

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

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.example.example">
33

4-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
5-
calls FlutterMain.startInitialization(this); in its onCreate method.
6-
In most cases you can leave this as-is, but you if you want to provide
7-
additional functionality it is fine to subclass or reimplement
8-
FlutterApplication and put your custom class here. -->
4+
<uses-permission android:name="android.permission.INTERNET"/>
5+
96
<application
10-
android:name="io.flutter.app.FlutterApplication"
117
android:label="example"
128
android:icon="@mipmap/ic_launcher">
139
<activity
14-
android:name=".MainActivity"
10+
android:name="io.flutter.embedding.android.FlutterActivity"
1511
android:launchMode="singleTop"
1612
android:theme="@style/LaunchTheme"
1713
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1814
android:hardwareAccelerated="true"
1915
android:windowSoftInputMode="adjustResize">
20-
<!-- This keeps the window background of the activity showing
21-
until Flutter renders its first frame. It can be removed if
22-
there is no splash screen (such as the default splash screen
23-
defined in @style/LaunchTheme). -->
24-
<meta-data
25-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
26-
android:value="true" />
2716
<intent-filter>
2817
<action android:name="android.intent.action.MAIN"/>
2918
<category android:name="android.intent.category.LAUNCHER"/>
3019
</intent-filter>
20+
21+
<meta-data
22+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
23+
android:resource="@drawable/launch_background" />
24+
<meta-data
25+
android:name="io.flutter.embedding.android.NormalTheme"
26+
android:resource="@style/NormalTheme" />
3127
</activity>
28+
29+
<meta-data
30+
android:name="flutterEmbedding"
31+
android:value="2" />
3232
</application>
3333
</manifest>

‎example/android/app/src/main/java/com/example/example/MainActivity.java

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

‎example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

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

‎example/android/app/src/main/res/values/styles.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
4-
<!-- Show a splash screen on the activity. Automatically removed when
5-
Flutter draws its first frame -->
4+
<item name="android:windowBackground">@drawable/launch_background</item>
5+
</style>
6+
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
67
<item name="android:windowBackground">@drawable/launch_background</item>
78
</style>
89
</resources>

‎example/android/app/src/profile/AndroidManifest.xml

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

‎example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.5.3'
8+
classpath 'com.android.tools.build:gradle:4.1.1'
99
}
1010
}
1111

‎example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.jvmargs=-Xmx1536M
22

3-
android.enableR8=true
43
android.useAndroidX=true
54
android.enableJetifier=true
5+
android.enableR8=true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Dec 12 15:22:42 MST 2019
1+
#Thu Nov 19 14:42:53 CET 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

‎example/ios/Podfile

Lines changed: 15 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,29 @@ project 'Runner', {
1010
'Release' => :release,
1111
}
1212

13-
def parse_KV_file(file, separator='=')
14-
file_abs_path = File.expand_path(file)
15-
if !File.exists? file_abs_path
16-
return [];
13+
def flutter_root
14+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15+
unless File.exist?(generated_xcode_build_settings_path)
16+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
1717
end
18-
pods_ary = []
19-
skip_line_start_symbols = ["#", "/"]
20-
File.foreach(file_abs_path) { |line|
21-
next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
22-
plugin = line.split(pattern=separator)
23-
if plugin.length == 2
24-
podname = plugin[0].strip()
25-
path = plugin[1].strip()
26-
podpath = File.expand_path("#{path}", file_abs_path)
27-
pods_ary.push({:name => podname, :path => podpath});
28-
else
29-
puts "Invalid plugin specification: #{line}"
30-
end
31-
}
32-
return pods_ary
18+
19+
File.foreach(generated_xcode_build_settings_path) do |line|
20+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
21+
return matches[1].strip if matches
22+
end
23+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
3324
end
3425

35-
target 'Runner' do
36-
# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
37-
# referring to absolute paths on developers' machines.
38-
system('rm -rf .symlinks')
39-
system('mkdir -p .symlinks/plugins')
26+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
4027

41-
# Flutter Pods
42-
generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
43-
if generated_xcode_build_settings.empty?
44-
puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first."
45-
end
46-
generated_xcode_build_settings.map { |p|
47-
if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
48-
symlink = File.join('.symlinks', 'flutter')
49-
File.symlink(File.dirname(p[:path]), symlink)
50-
pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
51-
end
52-
}
28+
flutter_ios_podfile_setup
5329

54-
# Plugin Pods
55-
plugin_pods = parse_KV_file('../.flutter-plugins')
56-
plugin_pods.map { |p|
57-
symlink = File.join('.symlinks', 'plugins', p[:name])
58-
File.symlink(p[:path], symlink)
59-
pod p[:name], :path => File.join(symlink, 'ios')
60-
}
30+
target 'Runner' do
31+
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
6132
end
6233

63-
# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
64-
install! 'cocoapods', :disable_input_output_paths => true
65-
6634
post_install do |installer|
6735
installer.pods_project.targets.each do |target|
68-
target.build_configurations.each do |config|
69-
config.build_settings['ENABLE_BITCODE'] = 'NO'
70-
end
36+
flutter_additional_ios_build_settings(target)
7137
end
7238
end

0 commit comments

Comments
 (0)