Skip to content

Commit ecfc41a

Browse files
author
Stewart Miles
authored
Merge pull request googlesamples#179 from Si1ver/master
Fixed typos in documentation and comments.
2 parents c8702fe + 92c2c3f commit ecfc41a

File tree

24 files changed

+57
-57
lines changed

24 files changed

+57
-57
lines changed

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238

239239
# Version 1.2.66 - April 27, 2018
240240
## Bug Fixes
241-
* Fixed Version Handler renaming of Linux libraries with hypens in filenames.
241+
* Fixed Version Handler renaming of Linux libraries with hyphens in filenames.
242242
Previously, libraries named Foo-1.2.3.so were not being renamed to
243243
libFoo-1.2.3.so on Linux which could break native library loading on some
244244
versions of Unity.
@@ -298,7 +298,7 @@
298298
# Version 1.2.57 - Oct 18, 2017
299299
## Bug Fixes
300300
* Updated Gradle wrapper to 4.2.1 to fix issues using Gradle with the
301-
latest openjdk.
301+
latest Openjdk.
302302
* Android Gradle resolution now also uses gradle.properties to pass
303303
parameters to Gradle in an attempt to workaround problems with
304304
command line argument parsing on Windows 10.
@@ -329,7 +329,7 @@
329329
## Bug Fixes
330330
* Improved Android Resolver auto-resolution speed.
331331
* Fixed bug in the Gradle Android Resolver which would result in resolution
332-
succeding when some dependencies are not found.
332+
succeeding when some dependencies are not found.
333333

334334
# Version 1.2.52 - Sep 25, 2017
335335
## New Features
@@ -363,7 +363,7 @@
363363
## Bug Fixes
364364
* Removed modulemap parsing in iOS Resolver.
365365
The framework *.modulemap did not need to be parsed by the iOS Resolver
366-
when injecting Cocaopods into a Xcode project. Simply adding a modular
366+
when injecting Cocoapods into a Xcode project. Simply adding a modular
367367
framework to a Xcode project results in Xcode's Clang parsing the associated
368368
modulemap and injecting any compile and link flags into the build process.
369369

@@ -493,7 +493,7 @@
493493
## New Features
494494
* Added support for build target selection based upon .NET framework
495495
version in the VersionHandler.
496-
When appling either gvh\_dotnet-3.5 or gvh\_dotnet-4.5 labels to
496+
When applying either gvh\_dotnet-3.5 or gvh\_dotnet-4.5 labels to
497497
assets, the VersionHandler will only enable the asset for the
498498
specified set of build targets when the matching .NET framework version
499499
is selected in Unity 2017's project settings. This allows assets
@@ -680,7 +680,7 @@
680680

681681
# Version 1.2.3 - Oct 25, 2016
682682
## Bug Fixes
683-
* Fixed exception when reporting conflicting depedencies.
683+
* Fixed exception when reporting conflicting dependencies.
684684

685685
# Version 1.2.2 - Oct 17, 2016
686686
## Bug Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ Manual resolution can be performed using the following menu options:
246246
Some AAR files (for example play-services-measurement) contain variables that
247247
are processed by the Android Gradle plugin. Unfortunately, Unity does not
248248
perform the same processing when using Unity's Internal Build System, so the
249-
Android Resolver plugin handles known cases of this variable substition
249+
Android Resolver plugin handles known cases of this variable substitution
250250
by exploding the AAR into a folder and replacing `${applicationId}` with the
251251
`bundleID`.
252252

sample/Assets/PlayServicesResolver/Editor/Resolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public ResolverImpl(object svcSupport)
6565
/// LATEST means the only the latest version.
6666
/// </para>
6767
/// </remarks>
68-
/// <param name="group">Group - the Group Id of the artiface</param>
68+
/// <param name="group">Group - the Group Id of the artifact</param>
6969
/// <param name="artifact">Artifact - Artifact Id</param>
7070
/// <param name="version">Version - the version constraint</param>
7171
/// <param name="packageIds">Optional list of Android SDK package identifiers.</param>
@@ -101,11 +101,11 @@ public ResolverImpl DependOn(string group, string artifact, string version, stri
101101
/// class should be loaded from.</param>
102102
public static ResolverImpl CreateSupportInstance(string clientName, string assemblyName = "Google.JarResolver")
103103
{
104-
// if we arent on Android default to an empty shim
104+
// if we aren't on Android default to an empty shim
105105
if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.Android)
106106
return new ResolverImpl(null);
107107

108-
// bail out with an empty instance if the PlayServicesSupport class isnt available
108+
// bail out with an empty instance if the PlayServicesSupport class isn't available
109109
var playServicesSupport = Google.VersionHandler.FindClass(assemblyName, "Google.JarResolver.PlayServicesSupport");
110110
if (playServicesSupport == null)
111111
return new ResolverImpl(null);

source/IOSResolver/src/IOSResolver.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ static IOSResolver() {
648648
RemapXcodeExtension();
649649
// NOTE: It's not possible to catch exceptions a missing reference
650650
// to the UnityEditor.iOS.Xcode assembly in this method as the runtime
651-
// will attempt to load the assemebly before the method is executed so
651+
// will attempt to load the assembly before the method is executed so
652652
// we handle exceptions here.
653653
try {
654654
InitializeTargetName();
@@ -1068,7 +1068,7 @@ private static void AddPodInternal(string podName,
10681068
if (!pod.Equals(existingPod)) {
10691069
Log(String.Format("Pod {0} already present, ignoring.\n" +
10701070
"Original declaration {1}\n" +
1071-
"Ignored declarion {2}\n", podName,
1071+
"Ignored declaration {2}\n", podName,
10721072
pods[podName].createdBy, createdBy ?? "(unknown)"),
10731073
level: LogLevel.Warning);
10741074
}
@@ -1146,7 +1146,7 @@ public static bool UpdateTargetSdk() {
11461146
/// </summary>
11471147
/// <returns>Key value pair of minimum SDK version (key) and
11481148
/// a list of pod names that require it (value) if the currently
1149-
/// selected target SDK version does not satify pod requirements, the list
1149+
/// selected target SDK version does not satisfy pod requirements, the list
11501150
/// (value) is null otherwise.</returns>
11511151
private static KeyValuePair<int, List<string>> TargetSdkNeedsUpdate() {
11521152
var kvpair = new KeyValuePair<int, List<string>>(0, null);
@@ -1839,7 +1839,7 @@ private static string FindPodTool() {
18391839
/// </summary>
18401840
private class CommandItem {
18411841
/// <summary>
1842-
/// Command to excecute.
1842+
/// Command to execute.
18431843
/// </summary>
18441844
public string Command { get; set; }
18451845
/// <summary>

source/JarResolverLib/src/Google.JarResolver/Dependency.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Google.JarResolver {
2323
/// Represents a dependency. A dependency is defined by a groupId,
2424
/// artifactId and version constraint. This information is used to search
2525
/// the repositories of artifacts to find a version that meets the version
26-
/// contraints (as well as be compatible with other dependencies' constraints).
26+
/// constraints (as well as be compatible with other dependencies' constraints).
2727
/// </summary>
2828
public class Dependency {
2929
// Extensions of files managed by the resolver.

source/JarResolverLib/src/Google.JarResolver/PlayServicesSupport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ private static Dependency AddCommonPackageIds(Dependency dep) {
253253
/// LATEST means the only the latest version.
254254
/// </para>
255255
/// </remarks>
256-
/// <param name="group">Group - the Group Id of the artiface</param>
256+
/// <param name="group">Group - the Group Id of the artifact</param>
257257
/// <param name="artifact">Artifact - Artifact Id</param>
258258
/// <param name="version">Version - the version constraint</param>
259259
/// <param name="packageIds">Optional list of Android SDK package identifiers.</param>

source/PackageManager/src/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class Constants {
7373
/// </summary>
7474
public const double FETCH_TIMOUT_THRESHOLD = 10.0d;
7575
/// <summary>
76-
/// The gpm deps xml postfix used to check for pacakge deps.
76+
/// The gpm deps xml postfix used to check for package deps.
7777
/// </summary>
7878
public const string GPM_DEPS_XML_POSTFIX = "gpm.dep.xml";
7979
/// <summary>

source/PackageManager/src/Controllers.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public static string DownloadCachePath {
205205
}
206206
}
207207
/// <summary>
208-
/// Verbose logging propery flag.
208+
/// Verbose logging property flag.
209209
/// </summary>
210210
public static bool VerboseLogging {
211211
get {
@@ -276,7 +276,7 @@ public enum ResponseCode {
276276
/// </summary>
277277
PLUGIN_INSTALLED,
278278
/// <summary>
279-
/// Plugin resolution (getting its data from source) succeded
279+
/// Plugin resolution (getting its data from source) succeeded
280280
/// </summary>
281281
PLUGIN_RESOLVED,
282282
/// <summary>
@@ -333,7 +333,7 @@ public interface IUriDataFetcher {
333333
/// <param name="result">Result string.</param>
334334
ResponseCode BlockingFetchAsString(Uri uri, out string result);
335335
/// <summary>
336-
/// Thead blocking fetch for a byte[] result.
336+
/// Thread blocking fetch for a byte[] result.
337337
/// </summary>
338338
/// <returns>The fetch as bytes.</returns>
339339
/// <param name="uri">URI.</param>
@@ -417,7 +417,7 @@ public static void SwapUriDataFetcher(IUriDataFetcher newFetcher) {
417417
}
418418

419419
/// <summary>
420-
/// Some constants are inconvenent for testing purposes. This class wraps the constants that
420+
/// Some constants are inconvenient for testing purposes. This class wraps the constants that
421421
/// may be changed during test execution.
422422
/// </summary>
423423
public static class TestableConstants {
@@ -554,7 +554,7 @@ static void CreateRegistryDatabase() {
554554
}
555555

556556
/// <summary>
557-
/// Refreshs the registry cache for the provided RegistryWrapper.
557+
/// Refreshes the registry cache for the provided RegistryWrapper.
558558
/// </summary>
559559
/// <param name="wrapper">Wrapper.</param>
560560
public static void RefreshRegistryCache(RegistryWrapper wrapper = null) {
@@ -721,7 +721,7 @@ public class PackagedPlugin {
721721
/// </summary>
722722
public static class PluginManagerController {
723723
/// <summary>
724-
/// The plugin cache assiciates RegistryWrapper keys to lists of PackagedPlugins that are
724+
/// The plugin cache associates RegistryWrapper keys to lists of PackagedPlugins that are
725725
/// part of the set of plugins defined by the Registry.
726726
/// </summary>
727727
static Dictionary<RegistryWrapper, List<PackagedPlugin>> pluginCache =
@@ -775,7 +775,7 @@ public static PackagedPlugin GetPluginForVersionlessKey(string versionlessKey) {
775775

776776
/// <summary>
777777
/// Gets the list of all plugins across all registered registries. If
778-
/// refresh is true then the plugin data returned is gaurenteed to be
778+
/// refresh is true then the plugin data returned is guaranteed to be
779779
/// up to date since each plugin source data is fetched prior to this
780780
/// method returning.
781781
/// </summary>
@@ -1138,7 +1138,7 @@ static void Update() {
11381138
}
11391139

11401140
if (projectDirty) {
1141-
// check project for re-resolve on target if ditry
1141+
// check project for re-resolve on target if dirty
11421142
RefreshProject();
11431143
}
11441144
}
@@ -1190,7 +1190,7 @@ static void RemoveClient(string clientName) {
11901190
}
11911191

11921192
/// <summary>
1193-
/// Refreshs the client, resolves it's dependencies if needed.
1193+
/// Refreshes the client, resolves it's dependencies if needed.
11941194
/// </summary>
11951195
/// <param name="client">Client.</param>
11961196
static void RefreshClient(ProjectClient client) {
@@ -1485,7 +1485,7 @@ static string GetProjectRecordPath() {
14851485
}
14861486

14871487
/// <summary>
1488-
/// Refreshs the list of asset labels that are present in the current project.
1488+
/// Refreshes the list of asset labels that are present in the current project.
14891489
/// This method does NOT modify the asset labels on assets, it just reads them all.
14901490
/// </summary>
14911491
public static void RefreshListOfAssetLabels() {

source/PackageManager/src/Models.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ public string GenerateAssetLabel() {
124124
}
125125

126126
/// <summary>
127-
/// Generates the unique key basd on the current groupId, artifactId and version.
127+
/// Generates the unique key based on the current groupId, artifactId and version.
128128
/// </summary>
129129
/// <returns>The unique key.</returns>
130130
public string GenerateUniqueKey() {
131131
if (groupId == null || artifactId == null || version == null) {
132132
throw new Exception(string.Format("Attempted to generate unique " +
133133
"key on object {0} without setting " +
134134
"object state. [groupId = {1}, artifactId = " +
135-
"{2}, verison = {3}]", this, ""+groupId,
135+
"{2}, version = {3}]", this, ""+groupId,
136136
""+artifactId, ""+version));
137137
}
138138
return string.Join(Constants.STRING_KEY_BINDER,
@@ -151,7 +151,7 @@ public string GenerateUniqueKey() {
151151
[XmlRoot("registry")]
152152
public class Registry : PackageManagerLabeledModel<Registry> {
153153
/// <summary>
154-
/// When was this registry last updated in epoc time.
154+
/// When was this registry last updated in epoch time.
155155
/// </summary>
156156
[XmlElement("lastUpdated")]
157157
public long lastUpdated;
@@ -174,7 +174,7 @@ public class Modules : PackageManagerModel<Modules> {
174174
/// 2) An absolute Uri to a location of a packaged plugin's package-manifest.xml
175175
///
176176
/// Note: It is permitted to mix representations in a registry model. Meaning you can have
177-
/// a mix of groupId representations and absolute Uri repesentations in the same registry.
177+
/// a mix of groupId representations and absolute Uri representations in the same registry.
178178
/// </summary>
179179
[XmlElement("module")]
180180
public List<string> module = new List<string>();
@@ -264,7 +264,7 @@ public class Language : PackageManagerModel<Language> {
264264
public string name;
265265

266266
/// <summary>
267-
/// A short description of the plugin. Usually a single marketing sentance.
267+
/// A short description of the plugin. Usually a single marketing sentence.
268268
/// </summary>
269269
[XmlElement("short")]
270270
public string shortDesc;

source/PackageManager/src/Views.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void Update() {
6262
EditorUtility.DisplayDialog("Registry Location Not Valid",
6363
string.Format(
6464
"The registry cannot be added. An " +
65-
"error has occured using the provided " +
65+
"error has occurred using the provided " +
6666
"location.\n\n{0}", rc),
6767
"Ok");
6868
}

source/PackageManagerTests/src/Google.PackageManager.Tests/ControllerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public ResponseCode BlockingFetchAsBytes(Uri uri, out byte[] result) {
180180
}
181181

182182
/// <summary>
183-
/// Test case set that excercises the PackageManagerController.
183+
/// Test case set that exercises the PackageManagerController.
184184
/// </summary>
185185
[TestFixture]
186186
public class ControllerTests {

source/PlayServicesResolver/src/AndroidSdkManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private string EscapeComponents(string packageName) {
7575
if (match.Success) {
7676
var prefix = packageName.Substring(0, match.Index);
7777
var postfix = packageName.Substring(match.Index + match.Length);
78-
// Exclaimation marks are guaranteed - at the moment - to not be
78+
// Exclamation marks are guaranteed - at the moment - to not be
7979
// part of a package name / path.
8080
packageName = prefix + match.Value.Replace("-", "!") + postfix;
8181
}

source/PlayServicesResolver/src/CommandLine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public static string[] SplitLines(string multilineString)
655655
}
656656

657657
/// <summary>
658-
/// Format a command excecution error message.
658+
/// Format a command execution error message.
659659
/// </summary>
660660
/// <param name="toolPath">Tool executed.</param>
661661
/// <param name="arguments">Arguments used to execute the tool.</param>

source/PlayServicesResolver/src/CommandLineDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private int CountLines(string str)
7575

7676
/// <summary>
7777
/// Called from RunCommandLine() tool to report the output of the currently
78-
/// executing commmand.
78+
/// executing command.
7979
/// </summary>
8080
/// <param name="process">Executing process.</param>
8181
/// <param name="stdin">Standard input stream.</param>

source/PlayServicesResolver/src/IResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface IResolver
2626
/// </summary>
2727
/// <remarks>
2828
/// The resolver with the greatest version is used when resolving.
29-
/// The value of the verison is calcuated using MakeVersion in DefaultResolver
29+
/// The value of the version is calculated using MakeVersion in DefaultResolver
3030
/// </remarks>
3131
/// <seealso cref="DefaultResolver.MakeVersionNumber"/>
3232
int Version();

source/PlayServicesResolver/src/PlayServicesResolver.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ private static bool CheckFilesForAutoResolution(HashSet<string> filesToCheck) {
796796

797797
/// <summary>
798798
/// Called by Unity when all assets have been updated. This
799-
/// is used to kick off resolving the dependendencies declared.
799+
/// is used to kick off resolving the dependencies declared.
800800
/// </summary>
801801
/// <param name="importedAssets">Imported assets. (unused)</param>
802802
/// <param name="deletedAssets">Deleted assets. (unused)</param>
@@ -970,7 +970,7 @@ private static void Reresolve() {
970970
/// * com.my.app.service --> com.another.app.service
971971
/// * foo.com.my.app.service --> foo.com.my.app.service (unchanged)
972972
/// </param>
973-
/// <param name="path">Path of this node in the hierachy of nodes. For example:
973+
/// <param name="path">Path of this node in the hierarchy of nodes. For example:
974974
/// given node is "<c>" in "<a><b><c>" this should be "a/b/c". If this
975975
/// value is null the name of the current node is used.</param>
976976
/// <returns>true if any replacements are applied, false otherwise.</returns>

source/PlayServicesResolver/src/ResolverVer1_1.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private class AarExplodeData
5151
public string targetAbis = ABI_UNIVERSAL;
5252
// Whether gradle is selected as the build system.
5353
public bool gradleBuildSystem = PlayServicesResolver.GradleBuildEnabled;
54-
// Whether gradle export is enabeld.
54+
// Whether gradle export is enabled.
5555
public bool gradleExport = PlayServicesResolver.GradleProjectExportEnabled;
5656
// AAR version that should be ignored when attempting to overwrite an existing
5757
// dependency. This is reset when the dependency is updated to a version different
@@ -396,7 +396,7 @@ private void SaveAarExplodeCache()
396396
/// Version of the resolver. - 1.1.0
397397
/// </summary>
398398
/// <remarks>The resolver with the greatest version is used when resolving.
399-
/// The value of the verison is calcuated using MakeVersion in DefaultResolver</remarks>
399+
/// The value of the version is calculated using MakeVersion in DefaultResolver</remarks>
400400
/// <seealso cref="DefaultResolver.MakeVersionNumber"></seealso>
401401
public override int Version()
402402
{

source/PlayServicesResolver/src/SettingsDialog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ internal static bool VerboseLogging {
182182

183183
internal static string ValidatePackageDir(string directory) {
184184
// Make sure the package directory starts with the same name.
185-
// This is case insentitive to handle cases where developers rename Unity
185+
// This is case insensitive to handle cases where developers rename Unity
186186
// project directories on Windows (which has a case insensitive file system by
187187
// default) then they use the project on OSX / Linux.
188188
if (!directory.ToLowerInvariant().StartsWith(AndroidPluginsDir.ToLower())) {

0 commit comments

Comments
 (0)