Skip to content

Commit

Permalink
Merge pull request #46 from apptentive/IOSOSX-1090
Browse files Browse the repository at this point in the history
Update for v5.0 async calls
  • Loading branch information
weeeBox authored Jan 19, 2018
2 parents bba6450 + 2492b2c commit 75097ad
Show file tree
Hide file tree
Showing 38 changed files with 496 additions and 379 deletions.
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</config-file>
<config-file target="./res/values/strings.xml" parent="/resources">
<string name="apptentive_distribution">Cordova</string>
<string name="apptentive_distribution_version">4.1.1</string>
<string name="apptentive_distribution_version">5.0.0</string>
</config-file>
<framework src="com.apptentive:apptentive-android:5.0.2"/>
<source-file src="src/android/ApptentiveBridge.java" target-dir="src/com/apptentive/cordova"/>
Expand Down Expand Up @@ -74,7 +74,7 @@
</config-file>

<config-file target="*-Info.plist" parent="ApptentivePluginVersion">
<string>4.1.1</string>
<string>5.0.0</string>
</config-file>

<!-- ApptentiveBridge -->
Expand Down
71 changes: 71 additions & 0 deletions src/ios/.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
---
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -1
ConstructorInitializerIndentWidth: 4

AlignAfterOpenBracket: false
AlignEscapedNewlinesLeft: true
AlignOperands: false
AlignTrailingComments: true

AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: true
AllowShortIfStatementsOnASingleLine: true
AllowShortFunctionsOnASingleLine: All
AllowShortLoopsOnASingleLine: true

AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakTemplateDeclarations: false
AlwaysBreakBeforeMultilineStrings: false

BreakBeforeBinaryOperators: None
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false

BinPackArguments: true
BinPackParameters: true
ColumnLimit: 0
ConstructorInitializerAllOnOneLineOrOnePerLine: true
DerivePointerAlignment: false
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
IndentWrappedFunctionNames: false
IndentFunctionDeclarationAfterType: false
MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: false
NamespaceIndentation: Inner
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: true
PenaltyBreakBeforeFirstCallParameter: 10000
PenaltyBreakComment: 300
PenaltyBreakString: 10000
PenaltyBreakFirstLessLess: 120
PenaltyExcessCharacter: 1
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Right
SpacesBeforeTrailingComments: 1
Cpp11BracedListStyle: true
Standard: Auto
IndentWidth: 4
TabWidth: 4
UseTab: Always
BreakBeforeBraces: Attach

SpacesInParentheses: false
SpacesInSquareBrackets: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterCStyleCast: false
SpacesInContainerLiterals: false
SpaceBeforeAssignmentOperators: true

ContinuationIndentWidth: 4
CommentPragmas: '^ IWYU pragma:'
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
SpaceBeforeParens: ControlStatements
DisableFormat: false
...
5 changes: 3 additions & 2 deletions src/ios/ApptentiveBridge.h
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#import <Cordova/CDV.h>


@interface ApptentiveBridge : CDVPlugin

- (void)execute:(CDVInvokedUrlCommand*)command;
- (void)execute:(CDVInvokedUrlCommand *)command;

@end
@end
Loading

0 comments on commit 75097ad

Please sign in to comment.