Merge pull request #74 from vanlooverenkoen/feature/upgrade-4.0.0

Fixed the analyzer version
gbtb16 · Oct 13, 2021 · fb7c391 · fb7c391
2 parents b0eaf1b + a5d1b48
commit fb7c391
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 45 deletions.
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,15 +4,15 @@ version: 0.1.0
 homepage: https://github.com/vanlooverenkoen/kiwi
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.14.0 <3.0.0'
 
 dependencies:
-  kiwi: ^3.0.0
+  kiwi: ^4.0.0
 
 dev_dependencies:
   test: ^1.17.5
-  build_runner: ^2.0.4
-  kiwi_generator: ^3.0.0
+  build_runner: ^2.1.4
+  kiwi_generator: ^4.0.0
 
 dependency_overrides:
   kiwi:

diff --git a/flutter_example/ios/Flutter/AppFrameworkInfo.plist b/flutter_example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>
diff --git a/flutter_example/ios/Runner.xcodeproj/project.pbxproj b/flutter_example/ios/Runner.xcodeproj/project.pbxproj
@@ -247,7 +247,6 @@
 /* Begin XCBuildConfiguration section */
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -291,7 +290,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -301,7 +300,6 @@
 		};
 		97C147041CF9000F007C117D /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -339,7 +337,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/flutter_example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/flutter_example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/flutter_example/pubspec.yaml b/flutter_example/pubspec.yaml
@@ -3,18 +3,18 @@ description: A Flutter example for kiwi
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  kiwi: ^3.0.0
+  kiwi: ^4.0.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.0.4
-  kiwi_generator: ^3.0.0
+  build_runner: ^2.1.4
+  kiwi_generator: ^4.0.0
 
 dependency_overrides:
   kiwi:

diff --git a/kiwi/CHANGELOG.md b/kiwi/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [4.0.0] - 2021-10-13
+### BREAKING
+- Support for kiwi_generator 4.0.0
+- Dart 2.14 min requirement
+### Updated dependencies
+
 ## [3.0.0] - 2021-06-01
 ### Added
 - Nullsafety codebase migration

diff --git a/kiwi/pubspec.yaml b/kiwi/pubspec.yaml
@@ -1,13 +1,13 @@
 name: kiwi
 description: A simple yet efficient dependency injection container for Dart and Flutter (can be coupled with the kiwi_generator package).
-version: 3.0.0
+version: 4.0.0
 homepage: https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.14.0-0 <3.0.0"
 
 dependencies:
-  meta: ^1.3.0
+  meta: ^1.7.0
 
 dev_dependencies:
   test: ^1.17.5
diff --git a/kiwi_generator/CHANGELOG.md b/kiwi_generator/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [4.0.0] - 2021-10-13
+### BREAKING
+- Updated to analyzer 2.0.0
+- Dart 2.14 min requirement
+### Updated dependencies
+
 ## [3.0.1] - 2021-07-15
 ### Updated
 - Generated core is now using the cascade operator

diff --git a/kiwi_generator/example/kiwi_generator_example.g.dart b/kiwi_generator/example/kiwi_generator_example.g.dart
diff --git a/kiwi_generator/pubspec.yaml b/kiwi_generator/pubspec.yaml
@@ -1,26 +1,26 @@
 name: kiwi_generator
 description: Generates dependency injection code using the kiwi package to reduce development time.
-version: 3.0.1
+version: 4.0.0
 homepage: https://github.com/vanlooverenkoen/kiwi/tree/master/kiwi_generator
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.14.0 <3.0.0'
 
 dependencies:
-  analyzer: ^1.7.1
-  build: ^2.0.2
+  analyzer: ^2.6.0
+  build: ^2.1.1
   build_config: ^1.0.0
-  code_builder: ^4.0.0
-  dart_style: ^2.0.1
-  kiwi: ^3.0.0
+  code_builder: ^4.1.0
+  dart_style: ^2.2.0
+  kiwi: ^4.0.0
   path: ^1.8.0
-  source_gen: ^1.0.1
-  built_collection: ^5.0.0
+  source_gen: ^1.1.1
+  built_collection: ^5.1.1
 
 dev_dependencies:
-  build_runner: ^2.0.4
-  build_test: ^2.1.0
-  test: ^1.17.5
+  build_runner: ^2.1.4
+  build_test: ^2.1.4
+  test: ^1.18.2
 
 dependency_overrides:
   kiwi:

diff --git a/tool/kiwi_analyze.sh b/tool/kiwi_analyze.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-cd ..
+CURRENT=`pwd`
+DIR_NAME=`basename "$CURRENT"`
+if [ $DIR_NAME == 'tool' ]
+then
+  cd ..
+fi
 
 echo ""
 echo "==========================="

diff --git a/tool/kiwi_build.sh b/tool/kiwi_build.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-cd ..
+CURRENT=`pwd`
+DIR_NAME=`basename "$CURRENT"`
+if [ $DIR_NAME == 'tool' ]
+then
+  cd ..
+fi
 
 echo ""
 echo "==========================="

diff --git a/tool/kiwi_format.sh b/tool/kiwi_format.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-cd ..
+CURRENT=`pwd`
+DIR_NAME=`basename "$CURRENT"`
+if [ $DIR_NAME == 'tool' ]
+then
+  cd ..
+fi
 
 echo ""
 echo "example format lib"

diff --git a/tool/kiwi_packages_get.sh b/tool/kiwi_packages_get.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-cd ..
+CURRENT=`pwd`
+DIR_NAME=`basename "$CURRENT"`
+if [ $DIR_NAME == 'tool' ]
+then
+  cd ..
+fi
 
 echo "example packages get"
 cd example

diff --git a/tool/kiwi_test.sh b/tool/kiwi_test.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-cd ..
+CURRENT=`pwd`
+DIR_NAME=`basename "$CURRENT"`
+if [ $DIR_NAME == 'tool' ]
+then
+  cd ..
+fi
 
 echo ""
 echo "example test"