Merge branch 'pre_v2.0.0'

Author: Qiuwen-chen

.clang-format

@@ -1,27 +1,95 @@
 ---
 BasedOnStyle: LLVM
-IndentWidth: 4
-TabWidth: 4
-AlwaysBreakTemplateDeclarations: true
-AllowShortFunctionsOnASingleLine: Inline
-BreakAfterJavaFieldAnnotations: true
-BreakBeforeBraces: Linux
-SpaceAfterCStyleCast: true
-IndentCaseLabels: true
 AccessModifierOffset: -4
-BreakBeforeBraces: Custom
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:
-    AfterNamespace: false
     AfterClass: false
+    AfterControlStatement: false
+    AfterEnum: false
     AfterFunction: true
-
-BreakConstructorInitializersBeforeComma: true
+    AfterNamespace: false
+    AfterObjCDeclaration: false
+    AfterStruct: false
+    AfterUnion: false
+    AfterExternBlock: false
+    BeforeCatch: false
+    BeforeElse: false
+    IndentBraces: false
+    SplitEmptyFunction: true
+    SplitEmptyRecord: true
+    SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeComma
+BreakStringLiterals: false
+ColumnLimit: 0
+CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-BinPackParameters: false
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 0
+Cpp11BracedListStyle: false
+DerivePointerAlignment: true
+FixNamespaceComments: true
+IncludeBlocks: Preserve
+IndentCaseLabels: false
+IndentPPDirectives: None  
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 1
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 1
+PenaltyBreakFirstLessLess: 1
+PenaltyBreakString: 1
+PenaltyExcessCharacter: 1
+PenaltyReturnTypeOnItsOwnLine: 1
+PointerAlignment: Right
 ReflowComments: false
+SortIncludes: true
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Auto
+TabWidth: 4
+UseTab: Never
 ---
 Language: Cpp
 ColumnLimit: 80
 ---
 Language: ObjC
-ColumnLimit: 0
+ColumnLimit: 0

.gitignore

@@ -17,3 +17,7 @@ xcuserdata
 xcuserdata/*
 *.xcworkspace/*
 *.xcworkspace
+DerivedData
+
+# WCDB
+WCDB.framework

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "sqlcipher"]
 	path = sqlcipher
-	url = https://github.com/Tencent/sqlcipher.git
+	url = git@github.com:Tencent/sqlcipher.git
 [submodule "openssl"]
 	path = openssl
 	url = https://github.com/openssl/openssl.git

VERSION

@@ -1 +1 @@
-1.1
+1.1.0

WCDB.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |wcdb|
   wcdb.license      = { :type => "BSD", :file => "LICENSE" }
   wcdb.author             = { "sanhuazhang" => "[email protected]" }
   wcdb.module_name = "WCDB"
-  wcdb.ios.deployment_target = "7.0"
+  wcdb.ios.deployment_target = "8.0"
   wcdb.osx.deployment_target = "10.9"
   wcdb.watchos.deployment_target = "2.0"
   wcdb.tvos.deployment_target = "9.0"

WCDB.swift.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |wcdb|
   wcdb.osx.deployment_target = "10.9"
   wcdb.watchos.deployment_target = "2.0"
   wcdb.tvos.deployment_target = "9.0"
-  wcdb.source       = { :git => "https://github.com/Tencent/wcdb.git", :tag => "v1.1.0" }
+  wcdb.source       = { :git => "https://github.com/Tencent/wcdb.git", :tag => "v#{wcdb.version}" }
   wcdb.source_files  = "swift/source/**/*.swift", "swift/source/**/**/*.swift", "swift/source/util/*.{h,c}"
   wcdb.module_name = "WCDBSwift"
   wcdb.requires_arc = true

WCDB.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,26 @@
+//
+// Created by qiuwenchen on 2022/9/22.
+//
+
+/*
+ * Tencent is pleased to support the open source community by making
+ * WCDB available.
+ *
+ * Copyright (C) 2017 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License"); you may not use
+ * this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *       https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <WCDB/WCDBCpp.h>
+#import <WCDB/WCDBObjc.h>