Skip to content

Commit

Permalink
Merge branch 'main' into feat/multidimensional_flavors
Browse files Browse the repository at this point in the history
  • Loading branch information
erickzanardo authored Apr 25, 2024
2 parents a83c4ee + 9ce814e commit 93b98b1
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 22 deletions.
10 changes: 10 additions & 0 deletions add_to_app/AndroidAddToAppDemo/.idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions add_to_app/AndroidAddToAppDemo/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions add_to_app/AndroidAddToAppDemo/.idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion add_to_app/AndroidAddToAppDemo/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
minSdk 24
targetSdk 33
versionCode 2
versionName "1.0"
versionName "1.0.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
2 changes: 1 addition & 1 deletion add_to_app/AndroidAddToAppDemo/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencyResolutionManagement {
google()
mavenCentral()
maven {
url '../my_flutter_module/build/host/outputs/repo'
url '../my_flutter_module/release'
}
maven {
url 'https://download.shorebird.dev/download.flutter.io'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
ED109CA42A77F5AF0057C32C /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDA0FE632A74754800439555 /* App.xcframework */; };
ED109CA52A77F5AF0057C32C /* App.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EDA0FE632A74754800439555 /* App.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
ED109CA72A77F5B00057C32C /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDA0FE642A74754800439555 /* Flutter.xcframework */; };
ED109CA82A77F5B00057C32C /* Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EDA0FE642A74754800439555 /* Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
ED085BEE2BD9988D0045C592 /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED085BEA2BD997F40045C592 /* App.xcframework */; };
ED085BEF2BD9988D0045C592 /* App.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ED085BEA2BD997F40045C592 /* App.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
ED085BF02BD9988E0045C592 /* ShorebirdFlutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED085BEC2BD997F70045C592 /* ShorebirdFlutter.xcframework */; };
ED085BF12BD9988E0045C592 /* ShorebirdFlutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ED085BEC2BD997F70045C592 /* ShorebirdFlutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
EDA0FE4F2A746CF200439555 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA0FE4E2A746CF200439555 /* AppDelegate.swift */; };
EDA0FE512A746CF200439555 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA0FE502A746CF200439555 /* SceneDelegate.swift */; };
EDA0FE532A746CF200439555 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDA0FE522A746CF200439555 /* ViewController.swift */; };
Expand All @@ -26,15 +26,17 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
ED109CA82A77F5B00057C32C /* Flutter.xcframework in Embed Frameworks */,
ED109CA52A77F5AF0057C32C /* App.xcframework in Embed Frameworks */,
ED085BEF2BD9988D0045C592 /* App.xcframework in Embed Frameworks */,
ED085BF12BD9988E0045C592 /* ShorebirdFlutter.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
ED085BEA2BD997F40045C592 /* App.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = App.xcframework; path = ../my_flutter_module/release/App.xcframework; sourceTree = "<group>"; };
ED085BEC2BD997F70045C592 /* ShorebirdFlutter.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:6V53YACS2W:Code Town Inc"; lastKnownFileType = wrapper.xcframework; name = ShorebirdFlutter.xcframework; path = ../my_flutter_module/release/ShorebirdFlutter.xcframework; sourceTree = "<group>"; };
EDA0FE4B2A746CF200439555 /* IosAddToAppDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IosAddToAppDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
EDA0FE4E2A746CF200439555 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
EDA0FE502A746CF200439555 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -43,17 +45,15 @@
EDA0FE572A746CF300439555 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
EDA0FE5A2A746CF300439555 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
EDA0FE5C2A746CF300439555 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EDA0FE632A74754800439555 /* App.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = App.xcframework; path = ../my_flutter_module/build/ios/framework/Release/App.xcframework; sourceTree = "<group>"; };
EDA0FE642A74754800439555 /* Flutter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Flutter.xcframework; path = ../my_flutter_module/build/ios/framework/Release/Flutter.xcframework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
EDA0FE482A746CF200439555 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
ED109CA72A77F5B00057C32C /* Flutter.xcframework in Frameworks */,
ED109CA42A77F5AF0057C32C /* App.xcframework in Frameworks */,
ED085BEE2BD9988D0045C592 /* App.xcframework in Frameworks */,
ED085BF02BD9988E0045C592 /* ShorebirdFlutter.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -94,8 +94,8 @@
EDA0FE622A74754800439555 /* Frameworks */ = {
isa = PBXGroup;
children = (
EDA0FE632A74754800439555 /* App.xcframework */,
EDA0FE642A74754800439555 /* Flutter.xcframework */,
ED085BEC2BD997F70045C592 /* ShorebirdFlutter.xcframework */,
ED085BEA2BD997F40045C592 /* App.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -236,7 +236,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../my_flutter_module/build/ios/framework/Release";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../my_flutter_module/release";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -297,7 +297,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../my_flutter_module/build/ios/framework/Release";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../my_flutter_module/release";
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -322,7 +322,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6V53YACS2W;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = IosAddToAppDemo/Info.plist;
Expand Down Expand Up @@ -350,7 +350,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6V53YACS2W;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = IosAddToAppDemo/Info.plist;
Expand Down
1 change: 1 addition & 0 deletions add_to_app/my_flutter_module/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Icon?
.tags*

build/
release/
.android/
.ios/
.flutter-plugins
Expand Down

0 comments on commit 93b98b1

Please sign in to comment.