Skip to content

Commit

Permalink
Update code
Browse files Browse the repository at this point in the history
  • Loading branch information
onmyway133 committed Sep 27, 2018
1 parent 58c8441 commit 11183c1
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 80 deletions.
105 changes: 51 additions & 54 deletions Example/GalleryDemo/GalleryDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,62 @@
objects = {

/* Begin PBXBuildFile section */
020B71F67A86E014F784D590 /* Pods_GalleryDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7EEE357D42BD2221D88982D /* Pods_GalleryDemo.framework */; };
D5C7F74E1C3BC9CE008CDDBA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D5C7F74C1C3BC9CE008CDDBA /* LaunchScreen.storyboard */; };
D5C7F75B1C3BCA1E008CDDBA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D5C7F7571C3BCA1E008CDDBA /* Assets.xcassets */; };
D5C7F75C1C3BCA1E008CDDBA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C7F7591C3BCA1E008CDDBA /* AppDelegate.swift */; };
D5C7F75D1C3BCA1E008CDDBA /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C7F75A1C3BCA1E008CDDBA /* ViewController.swift */; };
FF76C5CEA848CF09F64729B0 /* Pods_GalleryDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA935112E58D3F7E46BC586 /* Pods_GalleryDemo.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0DC5F9691C3C674FFE7A3FD8 /* Pods-GalleryDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GalleryDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo.release.xcconfig"; sourceTree = "<group>"; };
5D2433FAD43C46A120170F46 /* Pods-GalleryDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GalleryDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo.debug.xcconfig"; sourceTree = "<group>"; };
5DA935112E58D3F7E46BC586 /* Pods_GalleryDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GalleryDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
12DE065DBBCC78D71DF1B23F /* Pods-GalleryDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GalleryDemo.debug.xcconfig"; path = "Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo.debug.xcconfig"; sourceTree = "<group>"; };
9305D746F0EDAE48CDAC300B /* Pods-GalleryDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GalleryDemo.release.xcconfig"; path = "Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo.release.xcconfig"; sourceTree = "<group>"; };
D5C7F7401C3BC9CE008CDDBA /* GalleryDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GalleryDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
D5C7F74D1C3BC9CE008CDDBA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
D5C7F74F1C3BC9CE008CDDBA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D5C7F7571C3BCA1E008CDDBA /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D5C7F7591C3BCA1E008CDDBA /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
D5C7F75A1C3BCA1E008CDDBA /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
E7EEE357D42BD2221D88982D /* Pods_GalleryDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GalleryDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
D5C7F73D1C3BC9CE008CDDBA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FF76C5CEA848CF09F64729B0 /* Pods_GalleryDemo.framework in Frameworks */,
020B71F67A86E014F784D590 /* Pods_GalleryDemo.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
299574039BEF25964E2FD228 /* Frameworks */ = {
37E979FD9F31A11433FA428C /* Pods */ = {
isa = PBXGroup;
children = (
5DA935112E58D3F7E46BC586 /* Pods_GalleryDemo.framework */,
12DE065DBBCC78D71DF1B23F /* Pods-GalleryDemo.debug.xcconfig */,
9305D746F0EDAE48CDAC300B /* Pods-GalleryDemo.release.xcconfig */,
);
name = Frameworks;
name = Pods;
path = Pods;
sourceTree = "<group>";
};
A208DB60441639C365EAEAB6 /* Pods */ = {
AD9B9253B1B9DBEF5CA081D0 /* Frameworks */ = {
isa = PBXGroup;
children = (
5D2433FAD43C46A120170F46 /* Pods-GalleryDemo.debug.xcconfig */,
0DC5F9691C3C674FFE7A3FD8 /* Pods-GalleryDemo.release.xcconfig */,
E7EEE357D42BD2221D88982D /* Pods_GalleryDemo.framework */,
);
name = Pods;
name = Frameworks;
sourceTree = "<group>";
};
D5C7F7371C3BC9CE008CDDBA = {
isa = PBXGroup;
children = (
D5C7F7421C3BC9CE008CDDBA /* GalleryDemo */,
D5C7F7411C3BC9CE008CDDBA /* Products */,
A208DB60441639C365EAEAB6 /* Pods */,
299574039BEF25964E2FD228 /* Frameworks */,
37E979FD9F31A11433FA428C /* Pods */,
AD9B9253B1B9DBEF5CA081D0 /* Frameworks */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand Down Expand Up @@ -118,12 +119,11 @@
isa = PBXNativeTarget;
buildConfigurationList = D5C7F7521C3BC9CE008CDDBA /* Build configuration list for PBXNativeTarget "GalleryDemo" */;
buildPhases = (
5730ADD6D0678C89325EFEFC /* [CP] Check Pods Manifest.lock */,
29D0CEA9237F59A0364362EE /* [CP] Check Pods Manifest.lock */,
D5C7F73C1C3BC9CE008CDDBA /* Sources */,
D5C7F73D1C3BC9CE008CDDBA /* Frameworks */,
D5C7F73E1C3BC9CE008CDDBA /* Resources */,
D00EDE49C7E37FD8B0DD64EE /* [CP] Embed Pods Frameworks */,
021C6B29F02EA682869B3DD7 /* [CP] Copy Pods Resources */,
23ABC487252D5DF3737A6FAE /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -141,7 +141,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0900;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = "Hyper Interaktiv AS";
TargetAttributes = {
D5C7F73F1C3BC9CE008CDDBA = {
Expand Down Expand Up @@ -183,31 +183,52 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
021C6B29F02EA682869B3DD7 /* [CP] Copy Pods Resources */ = {
23ABC487252D5DF3737A6FAE /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
"${BUILT_PRODUCTS_DIR}/Gallery/Gallery.framework",
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gallery.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo-resources.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5730ADD6D0678C89325EFEFC /* [CP] Check Pods Manifest.lock */ = {
29D0CEA9237F59A0364362EE /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-GalleryDemo-checkManifestLockResult.txt",
);
Expand All @@ -216,34 +237,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
D00EDE49C7E37FD8B0DD64EE /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
"${BUILT_PRODUCTS_DIR}/Gallery/Gallery.framework",
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gallery.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-GalleryDemo/Pods-GalleryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -282,12 +275,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand Down Expand Up @@ -319,7 +314,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -335,12 +330,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -365,14 +362,14 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
VALIDATE_PRODUCT = YES;
};
name = Release;
};
D5C7F7531C3BC9CE008CDDBA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D2433FAD43C46A120170F46 /* Pods-GalleryDemo.debug.xcconfig */;
baseConfigurationReference = 12DE065DBBCC78D71DF1B23F /* Pods-GalleryDemo.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand All @@ -390,7 +387,7 @@
};
D5C7F7541C3BC9CE008CDDBA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0DC5F9691C3C674FFE7A3FD8 /* Pods-GalleryDemo.release.xcconfig */;
baseConfigurationReference = 9305D746F0EDAE48CDAC300B /* Pods-GalleryDemo.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Example/GalleryDemo/GalleryDemo/Sources/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return controller
}()

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
window = UIWindow(frame: UIScreen.main.bounds)
window?.rootViewController = navigationController
window?.makeKeyAndVisible()
Expand Down
4 changes: 2 additions & 2 deletions Example/GalleryDemo/GalleryDemo/Sources/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class ViewController: UIViewController, LightboxControllerDismissalDelegate, Gal

button = UIButton(type: .system)
button.frame.size = CGSize(width: 200, height: 50)
button.setTitle("Open Gallery", for: UIControlState())
button.setTitle("Open Gallery", for: UIControl.State())
button.addTarget(self, action: #selector(buttonTouched(_:)), for: .touchUpInside)

view.addSubview(button)
Expand Down Expand Up @@ -79,7 +79,7 @@ class ViewController: UIViewController, LightboxControllerDismissalDelegate, Gal
SVProgressHUD.show()
Image.resolve(images: images, completion: { [weak self] resolvedImages in
SVProgressHUD.dismiss()
self?.showLightbox(images: resolvedImages.flatMap({ $0 }))
self?.showLightbox(images: resolvedImages.compactMap({ $0 }))
})
}

Expand Down
37 changes: 22 additions & 15 deletions Example/GalleryDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,39 @@
PODS:
- Cache (4.1.2)
- Gallery (2.0.3)
- Cache (5.2.0)
- Gallery (2.1.0)
- Hue (3.0.1)
- Imaginary (3.0.2):
- Cache (~> 4.0)
- Lightbox (2.1.1):
- Hue (~> 3.0)
- Imaginary (~> 3.0)
- SVProgressHUD (2.2.2)
- Imaginary (4.2.0):
- Cache (~> 5.0)
- Lightbox (2.3.0):
- Imaginary (~> 4.0)
- SVProgressHUD (2.2.5)

DEPENDENCIES:
- Gallery (from `../../`)
- Hue
- Lightbox
- SVProgressHUD

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Cache
- Hue
- Imaginary
- Lightbox
- SVProgressHUD

EXTERNAL SOURCES:
Gallery:
:path: ../../
:path: "../../"

SPEC CHECKSUMS:
Cache: bd0233fc688b5e83a27bcd87807db7e6f23adcc5
Gallery: 6a263a0ca5a9407ec65c6a9232503611cc5d6b52
Cache: 807c5d86d01a177f06ede9865add3aea269bbfd4
Gallery: ced3429c72468c2f192d665c46960a87726f2182
Hue: 93e852fa6211ab35922ad8c293f51c43d6c79eb2
Imaginary: d675200546110e305d6a26db6267c0622ffe5e6b
Lightbox: 30dc3540527e03194a10ee51be8ad5e039a1893f
SVProgressHUD: 59b2d3dabacbd051576d21d32293ca7228dc18b0
Imaginary: dae33d06dbc2ada22f98afef5eb45cc061311a2c
Lightbox: d317750e4132bfb871a5307cfe0a2c7d6a583c65
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6

PODFILE CHECKSUM: c95332f23ba226af26fd7b4ba1d3ffabf7836bf0

COCOAPODS: 1.3.1
COCOAPODS: 1.6.0.beta.1
2 changes: 1 addition & 1 deletion Gallery.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Gallery"
s.summary = "Something good about gallery"
s.version = "2.0.7"
s.version = "2.2.0"
s.homepage = "https://github.com/hyperoslo/Gallery"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "[email protected]" }
Expand Down
Loading

0 comments on commit 11183c1

Please sign in to comment.