Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci skip] Template files updated #13

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
.buildlog/
.history
.svn/
.firebase/
.flutter-plugins-dependencies


# IntelliJ related
*.iml
Expand Down Expand Up @@ -41,8 +38,6 @@ app.*.map.json
.packages
.pub-cache/
.pub/
/build/
test_goldens/failures/
build/

# Android related
Expand Down Expand Up @@ -72,7 +67,6 @@ build/
**/ios/**/profile
**/ios/**/xcuserdata
**/ios/.generated/
**/ios/Flutter/.last_build_id
**/ios/Flutter/App.framework
**/ios/Flutter/Flutter.framework
**/ios/Flutter/Flutter.podspec
Expand All @@ -91,9 +85,6 @@ build/
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

**/google-services.json
**/GoogleService-Info.plist

# End of https://www.toptal.com/developers/gitignore/api/flutter

android/google-play-service-account.json
Expand All @@ -107,4 +98,4 @@ android/google-play-service-account.json
.env.temp
.secrets.*
.cicd/
keystore.jks
keystore.jks
41 changes: 3 additions & 38 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,45 +1,10 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
channel: main
revision: 5f21edf8b66e31a39133177319414395cc5b5f48
channel: unknown

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: android
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: ios
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: linux
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: macos
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: web
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
- platform: windows
create_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7
base_revision: f6b9c4da23f88394ae33a1915da47274a2d705d7

# User provided section

# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'
6 changes: 3 additions & 3 deletions _ops/.env
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ EXTRA_PATHS=$HOME/Library/Android/sdk/cmdline-tools/latest/bin:$HOME/Library/And
# Flutter env vars for dart app
# Below command is for Macos. Use base64 -w0 in Linux
# echo '--dart-define APP_NAME=[DEV]GalleryApp --dart-define APP_SUFFIX=gallery.dev' | base64
DART_DEFINES_B64_dev=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bREVWXUdhbGxlcnlBcHAgLS1kYXJ0LWRlZmluZSBBUFBfU1VGRklYPWdhbGxlcnkuZGV2Cg==
DART_DEFINES_B64_dev=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bREVWXUZsdW1vIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1mbHVtby5kZXYK
# echo '--dart-define APP_NAME=GalleryApp --dart-define APP_SUFFIX=gallery' | base64
DART_DEFINES_B64_prod=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1HYWxsZXJ5QXBwIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1nYWxsZXJ5Cg==
DART_DEFINES_B64_prod=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1GbHVtbyAtLWRhcnQtZGVmaW5lIEFQUF9TVUZGSVg9Zmx1bW8K
# echo '--dart-define APP_NAME=[beta]GalleryApp --dart-define APP_SUFFIX=gallery.beta' | base64
DART_DEFINES_B64_beta=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bYmV0YV1HYWxsZXJ5QXBwIC0tZGFydC1kZWZpbmUgQVBQX1NVRkZJWD1nYWxsZXJ5LmJldGEK
DART_DEFINES_B64_beta=LS1kYXJ0LWRlZmluZSBBUFBfTkFNRT1bYmV0YV1GbHVtbyAtLWRhcnQtZGVmaW5lIEFQUF9TVUZGSVg9Zmx1bW8uYmV0YQo=
2 changes: 1 addition & 1 deletion _ops/utils/bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ elif [[ "${SUFFIX:-}" != "" ]]; then
fi

# Count commits
COMMITS=$(git rev-list HEAD --count)
COMMITS=$(git rev-list --count --all)
INCREMENT=1

# For Flutter aps
Expand Down
33 changes: 18 additions & 15 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
include: package:flutter_lints/flutter.yaml
analyzer:
exclude: [build/**]
errors:
uri_has_not_been_generated: ignore
plugins:
- angular

# Lint rules and documentation, see http://dart-lang.github.io/linter/lints
linter:
# In addition to the flutter_lints
rules:
- always_declare_return_types
- avoid_types_on_closure_parameters
- avoid_void_async
- cancel_subscriptions
- close_sinks
- directives_ordering
- flutter_style_todos
- package_api_docs
- prefer_single_quotes
- hash_and_equals
- iterable_contains_unrelated_type
- list_remove_unrelated_type
- test_types_in_equals
- throw_in_finally
- unawaited_futures
- unnecessary_statements
- unsafe_html
- use_super_parameters
- unrelated_type_equality_checks
- valid_regexps

global_options:
angular|angular:
options:
no-emit-component-factories: True
no-emit-injectable-factories: True
9 changes: 0 additions & 9 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,3 @@ gradle-wrapper.jar
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java

# CD
fastlane/report.xml

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
key.properties
**/*.keystore
**/*.jks
2 changes: 1 addition & 1 deletion android/app/src/main/res/drawable/launch_background.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/backgroundColor" />
<item android:drawable="@android:color/white" />

<!-- You can insert your own image assets here -->
<!-- <item>
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 8 additions & 9 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:windowSplashScreenBackground">@color/backgroundColor</item>
</style>
<color name="backgroundColor">#E6EBEB</color>
<!-- Theme applied to the Android Window as soon as the process has started.
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">@drawable/launch_background</item>
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="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="android:windowBackground">@android:color/white</item>
</style>
</resources>
32 changes: 11 additions & 21 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,44 +1,34 @@
buildscript {
ext.kotlin_version = '1.7.10'
ext.gradle_version = '7.4.2'
ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
jcenter { url "https://jcenter.bintray.com/" }
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://maven.google.com' }
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
// START: FlutterFire Configuration
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
// END: FlutterFire Configuration
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}

configurations.classpath {
resolutionStrategy.activateDependencyLocking()
}
}

allprojects {
repositories {
google()
mavenCentral()
jcenter { url "https://jcenter.bintray.com/" }
maven { url 'https://repo1.maven.org/maven2' }
maven { url 'https://maven.google.com' }
}
}

rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')

dependencyLocking {
ignoredDependencies.add('io.flutter:*')
lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile")
if (!project.hasProperty('local-engine-repo')) {
lockAllConfigurations()
}
}
}

tasks.register("clean", Delete) {
Expand Down
3 changes: 1 addition & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
org.gradle.jvmargs=-Xmx1024M
android.useAndroidX=true
android.enableJetifier=true
org.gradle.caching=true
1 change: 1 addition & 0 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
27 changes: 11 additions & 16 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
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
}
settings.ext.flutterSdkPath = flutterSdkPath()
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
include ':app'

plugins {
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
}
}
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()

include ":app", ":crane"
assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }

apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
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"
2 changes: 0 additions & 2 deletions ios/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
**/dgph
*.mode1v3
*.mode2v3
*.moved-aside
Expand All @@ -19,7 +18,6 @@ Flutter/App.framework
Flutter/Flutter.framework
Flutter/Flutter.podspec
Flutter/Generated.xcconfig
Flutter/ephemeral/
Flutter/app.flx
Flutter/app.zip
Flutter/flutter_assets/
Expand Down
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
16 changes: 11 additions & 5 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -32,15 +32,21 @@ target 'Runner' do
use_modular_headers!

flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end

end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end


installer.generated_projects.each do |project|
project.targets.each do |target|
target.build_configurations.each do |config|
if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].split('.').first.to_i < 9
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
end
end
end
end
end
Loading