Skip to content

Commit 65301de

Browse files
authored
Merge pull request #4 from Thundernerd/develop
Develop
2 parents 9cefcf5 + e788aa6 commit 65301de

File tree

8 files changed

+40
-25
lines changed

8 files changed

+40
-25
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [1.1.2] - 2020-08-23
4+
5+
###Added
6+
- Hiding warning 162 with pragma
7+
8+
###Updated
9+
- var to explicit type
10+
- author name to TNRD
11+
312
## [1.1.1] - 2020-08-19
413

514
### Fixed

Runtime/SafeEvent.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Invoke()
2020
if (subscriptions == null)
2121
return;
2222

23-
foreach (var subscription in subscriptions)
23+
foreach (Action subscription in subscriptions)
2424
{
2525
#if UNITY_EDITOR || DEBUG
2626
ThrowIfInvalidSubscription(subscription);
@@ -59,7 +59,9 @@ public void Subscribe(Action action)
5959
#if UNITY_EDITOR || DEBUG
6060
throw new DuplicateSubscriptionException();
6161
#endif
62+
#pragma warning disable 162
6263
return;
64+
#pragma warning restore 162
6365
}
6466

6567
subscriptions.Add(action);

Runtime/SafeEventOneParameter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Invoke(T obj)
2020
if (subscriptions == null)
2121
return;
2222

23-
foreach (var subscription in subscriptions)
23+
foreach (Action<T> subscription in subscriptions)
2424
{
2525
#if UNITY_EDITOR || DEBUG
2626
ThrowIfInvalidSubscription(subscription);
@@ -59,7 +59,9 @@ public void Subscribe(Action<T> action)
5959
#if UNITY_EDITOR || DEBUG
6060
throw new DuplicateSubscriptionException();
6161
#endif
62+
#pragma warning disable 162
6263
return;
64+
#pragma warning restore 162
6365
}
6466

6567
subscriptions.Add(action);

Runtime/SafeEventTwoParameters.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Invoke(T arg1, T2 arg2)
2020
if (subscriptions == null)
2121
return;
2222

23-
foreach (var subscription in subscriptions)
23+
foreach (Action<T, T2> subscription in subscriptions)
2424
{
2525
#if UNITY_EDITOR || DEBUG
2626
ThrowIfInvalidSubscription(subscription);
@@ -59,7 +59,9 @@ public void Subscribe(Action<T, T2> action)
5959
#if UNITY_EDITOR || DEBUG
6060
throw new DuplicateSubscriptionException();
6161
#endif
62+
#pragma warning disable 162
6263
return;
64+
#pragma warning restore 162
6365
}
6466

6567
subscriptions.Add(action);

Tests/Runtime/SafeEventOneParameterTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class SafeEventOneParameterTests
99
[Test]
1010
public void Invoke_On_Behaviour()
1111
{
12-
var holder = new GameObject();
13-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
12+
GameObject holder = new GameObject();
13+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
1414

1515
SafeEvent<int> sf;
1616
sf.Subscribe(dummyBehaviour.Dummy);
@@ -25,8 +25,8 @@ public void Invoke_On_Behaviour()
2525
[UnityTest]
2626
public IEnumerator Invoke_On_Destroyed_Behaviour()
2727
{
28-
var holder = new GameObject();
29-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
28+
GameObject holder = new GameObject();
29+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
3030

3131
SafeEvent<int> sf;
3232
sf.Subscribe(dummyBehaviour.Dummy);
@@ -51,8 +51,8 @@ public IEnumerator Invoke_On_Destroyed_Behaviour()
5151
[UnityTest]
5252
public IEnumerator Invoke_On_Destroyed_GameObject()
5353
{
54-
var holder = new GameObject();
55-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
54+
GameObject holder = new GameObject();
55+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
5656

5757
SafeEvent<int> sf;
5858
sf.Subscribe(dummyBehaviour.Dummy);

Tests/Runtime/SafeEventTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class SafeEventTests
99
[Test]
1010
public void Invoke_On_Behaviour()
1111
{
12-
var holder = new GameObject();
13-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
12+
GameObject holder = new GameObject();
13+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
1414

1515
SafeEvent sf;
1616
sf.Subscribe(dummyBehaviour.Dummy);
@@ -23,8 +23,8 @@ public void Invoke_On_Behaviour()
2323
[UnityTest]
2424
public IEnumerator Invoke_On_Destroyed_Behaviour()
2525
{
26-
var holder = new GameObject();
27-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
26+
GameObject holder = new GameObject();
27+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
2828

2929
SafeEvent sf;
3030
sf.Subscribe(dummyBehaviour.Dummy);
@@ -49,8 +49,8 @@ public IEnumerator Invoke_On_Destroyed_Behaviour()
4949
[UnityTest]
5050
public IEnumerator Invoke_On_Destroyed_GameObject()
5151
{
52-
var holder = new GameObject();
53-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
52+
GameObject holder = new GameObject();
53+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
5454

5555
SafeEvent sf;
5656
sf.Subscribe(dummyBehaviour.Dummy);
@@ -75,8 +75,8 @@ public IEnumerator Invoke_On_Destroyed_GameObject()
7575
[UnityTest]
7676
public IEnumerator Dispatch_Exposed_Action()
7777
{
78-
var holder = new GameObject();
79-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
78+
GameObject holder = new GameObject();
79+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
8080
yield return null;
8181

8282
bool invoked = false;

Tests/Runtime/SafeEventTwoParametersTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class SafeEventTwoParametersTests
99
[Test]
1010
public void Invoke_On_Behaviour()
1111
{
12-
var holder = new GameObject();
13-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
12+
GameObject holder = new GameObject();
13+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
1414

1515
SafeEvent<int, int> sf;
1616
sf.Subscribe(dummyBehaviour.Dummy);
@@ -27,8 +27,8 @@ public void Invoke_On_Behaviour()
2727
[UnityTest]
2828
public IEnumerator Invoke_On_Destroyed_Behaviour()
2929
{
30-
var holder = new GameObject();
31-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
30+
GameObject holder = new GameObject();
31+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
3232

3333
SafeEvent<int, int> sf;
3434
sf.Subscribe(dummyBehaviour.Dummy);
@@ -53,8 +53,8 @@ public IEnumerator Invoke_On_Destroyed_Behaviour()
5353
[UnityTest]
5454
public IEnumerator Invoke_On_Destroyed_GameObject()
5555
{
56-
var holder = new GameObject();
57-
var dummyBehaviour = holder.AddComponent<DummyBehaviour>();
56+
GameObject holder = new GameObject();
57+
DummyBehaviour dummyBehaviour = holder.AddComponent<DummyBehaviour>();
5858

5959
SafeEvent<int, int> sf;
6060
sf.Subscribe(dummyBehaviour.Dummy);

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "net.tnrd.safeevent",
33
"displayName": "Safe Event",
4-
"version": "1.1.1",
4+
"version": "1.1.2",
55
"unity": "2019.1",
66
"description": "An event class that has extra checks to help prevent mistakes",
77
"keywords": [
@@ -17,7 +17,7 @@
1717
"issues"
1818
],
1919
"author": {
20-
"name": "Christiaan Bloemendaal",
20+
"name": "TNRD",
2121
"email": "[email protected]",
2222
"url": "https://www.tnrd.net"
2323
},

0 commit comments

Comments
 (0)