Skip to content

Commit 6c64a28

Browse files
committed
Merge pull request #35 from mdewolfe/master
Added full support for ARC.
2 parents cdb8a03 + 2e594e7 commit 6c64a28

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

AutoScrollLabel.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Pod::Spec.new do |s|
22
s.name = 'AutoScrollLabel'
3-
s.version = '0.2.1'
3+
s.version = '0.3.0'
44
s.summary = 'A marquee like scrolling UILabel, think iPod track title scrolling. Provides edge fading, speed adjustment, scroll direction, etc.'
55
s.homepage = 'https://github.com/cbess/AutoScrollLabel'
66

77
s.license = { :type => 'MIT', :file => 'LICENSE.txt' }
88
s.author = { 'Christopher Bess' => 'cbess@quantumquinn.com' }
9-
s.source = { :git => 'https://github.com/cbess/AutoScrollLabel.git', :tag => 'v0.2.1' }
9+
s.source = { :git => 'https://github.com/cbess/AutoScrollLabel.git', :tag => 'v0.3.0' }
1010

1111
s.platform = :ios, '6.0'
12-
s.requires_arc = false
12+
s.requires_arc = true
1313
s.source_files = 'CBAutoScrollLabel/*.{h,m}'
1414
s.frameworks = 'QuartzCore', 'CoreGraphics'
1515
s.screenshots = 'https://github.com/cbess/AutoScrollLabel/raw/master/AutoScrollLabelDemo/screenshot.png'

CBAutoScrollLabel/CBAutoScrollLabel.m

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,10 @@ - (void)commonInit
8484
// store labels
8585
[self.scrollView addSubview:label];
8686
[labelSet addObject:label];
87-
88-
#if ! __has_feature(objc_arc)
89-
[label release];
90-
#endif
9187
}
9288

9389
self.labels = [labelSet.allObjects copy];
9490

95-
#if ! __has_feature(objc_arc)
96-
[labelSet release];
97-
#endif
98-
9991
// default values
10092
_scrollDirection = CBAutoScrollDirectionLeft;
10193
_scrollSpeed = kDefaultPixelsPerSecond;
@@ -114,13 +106,8 @@ - (void)commonInit
114106

115107
- (void)dealloc
116108
{
117-
self.labels = nil;
118109
[NSObject cancelPreviousPerformRequestsWithTarget:self];
119110
[[NSNotificationCenter defaultCenter] removeObserver:self];
120-
121-
#if ! __has_feature(objc_arc)
122-
[super dealloc];
123-
#endif
124111
}
125112

126113
- (void)setFrame:(CGRect)frame
@@ -140,10 +127,6 @@ - (UIScrollView *)scrollView
140127
_scrollView.backgroundColor = [UIColor clearColor];
141128

142129
[self addSubview:_scrollView];
143-
144-
#if ! __has_feature(objc_arc)
145-
[_scrollView release];
146-
#endif
147130
}
148131
return _scrollView;
149132
}

0 commit comments

Comments
 (0)