Skip to content
This repository was archived by the owner on Oct 19, 2023. It is now read-only.

Commit f4606f9

Browse files
author
Jeff Verkoeyen
committed
Merge branch 'release-candidate' into stable
2 parents d8f3246 + a11265f commit f4606f9

14 files changed

+77
-43
lines changed

.clang-format-ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ lint_clang_format() {
4848
git fetch > /dev/null
4949
TAG=$(git tag --sort=v:refname -l "$CLANG_FORMAT_CI_VERSION" | tail -n1)
5050
git checkout "$TAG" > /dev/null
51+
git submodule update --init --recursive
5152
echo "Using clang-format-ci $TAG"
5253
popd
5354

.kokoro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ popd
3434

3535
if [ -n "$KOKORO_BUILD_NUMBER" ]; then
3636
bazel version
37-
use_bazel.sh 0.20.0
37+
use_bazel.sh 1.1.0
3838
bazel version
3939
fi
4040

41-
./.kokoro-ios-runner/bazel.sh test //:UnitTests 8.1.0
41+
./.kokoro-ios-runner/bazel.sh test //:UnitTests --min-xcode-version 9.0
4242

4343
echo "Success!"

BUILD

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
15+
load("@bazel_skylib//rules:build_test.bzl", "build_test")
16+
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test_suite")
17+
load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
1618
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
1719
load("@bazel_ios_warnings//:strict_warnings_objc_library.bzl", "strict_warnings_objc_library")
1820
load(":apple_framework_relative_headers.bzl", "apple_framework_relative_headers")
@@ -50,6 +52,13 @@ apple_framework_relative_headers(
5052
framework_name = "MDFInternationalization",
5153
)
5254

55+
build_test(
56+
name = "BuildTest",
57+
targets = [
58+
":MDFInternationalization"
59+
],
60+
)
61+
5362
objc_library(
5463
name = "UnitTestsLib",
5564
srcs = glob([
@@ -59,15 +68,43 @@ objc_library(
5968
":MDFInternationalization",
6069
":MDFInternationalizationFrameworkHeaders",
6170
],
62-
visibility = ["//visibility:private"],
6371
)
6472

65-
ios_unit_test(
73+
ios_test_runner(
74+
name = "IPAD_PRO_12_9_IN_9_3",
75+
device_type = "iPad Pro (12.9-inch)",
76+
os_version = "9.3",
77+
)
78+
79+
ios_test_runner(
80+
name = "IPHONE_7_PLUS_IN_10_3",
81+
device_type = "iPhone 7 Plus",
82+
os_version = "10.3",
83+
)
84+
85+
ios_test_runner(
86+
name = "IPHONE_X_IN_11_4",
87+
device_type = "iPhone X",
88+
os_version = "11.4",
89+
)
90+
91+
ios_test_runner(
92+
name = "IPHONE_XS_MAX_IN_12_2",
93+
device_type = "iPhone Xs Max",
94+
os_version = "12.2",
95+
)
96+
97+
ios_unit_test_suite(
6698
name = "UnitTests",
6799
deps = [
68100
":UnitTestsLib",
69101
],
70-
minimum_os_version = "8.0",
102+
minimum_os_version = "9.0",
71103
timeout = "short",
72-
visibility = ["//visibility:private"],
104+
runners = [
105+
":IPAD_PRO_12_9_IN_9_3",
106+
":IPHONE_7_PLUS_IN_10_3",
107+
":IPHONE_X_IN_11_4",
108+
":IPHONE_XS_MAX_IN_12_2",
109+
],
73110
)

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 3.0.0
2+
3+
This major release drops support for iOS 9 and 10.
4+
15
# 2.0.1
26

37
This patch release fixes framework-style imports when using bazel to build this library as an

Examples/Flags/MDFInternationalizationExample/BidirectionalViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "BidirectionalViewController.h"
1818

19-
#import <MDFInternationalization/MDFInternationalization.h>
19+
#import "MDFInternationalization.h"
2020

2121

2222
static NSString *LTREmbedding = @"\u202a"; // left-to-right embedding

Examples/Flags/MDFInternationalizationExample/CountryCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "CountryCell.h"
1818

19-
#import <MDFInternationalization/MDFInternationalization.h>
19+
#import "MDFInternationalization.h"
2020

2121
@implementation CountryCell
2222

Examples/Flags/MDFInternationalizationExample/InformationViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import "InformationViewController.h"
1818

19-
#import <MDFInternationalization/MDFInternationalization.h>
19+
#import "MDFInternationalization.h"
2020

2121
@interface InformationViewController ()
2222
@property (weak, nonatomic) IBOutlet UILabel *deviceLabel;

MDFInternationalization.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "MDFInternationalization"
3-
s.version = "2.0.1"
3+
s.version = "3.0.0"
44
s.authors = "The Material Foundation Authors"
55
s.summary = "Internationalization tools."
66
s.homepage = "https://github.com/material-foundation/material-internationalization-ios"
77
s.license = "Apache License, Version 2.0"
88
s.source = { :git => "https://github.com/material-foundation/material-internationalization-ios.git", :tag => "v#{s.version}" }
9-
s.platform = :ios, "8.0"
9+
s.platform = :ios, "11.0"
1010

1111
s.requires_arc = true
1212
s.public_header_files = "Sources/*.h"

Sources/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.1</string>
18+
<string>3.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Sources/MDFInternationalization.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
#import <UIKit/UIKit.h>
1818

19-
#import <MDFInternationalization/MDFRTL.h>
20-
#import <MDFInternationalization/NSLocale+MaterialRTL.h>
21-
#import <MDFInternationalization/NSString+MaterialBidi.h>
22-
#import <MDFInternationalization/UIImage+MaterialRTL.h>
23-
#import <MDFInternationalization/UIView+MaterialRTL.h>
19+
#import "MDFRTL.h" // IWYU pragma: export
20+
#import "NSLocale+MaterialRTL.h" // IWYU pragma: export
21+
#import "NSString+MaterialBidi.h" // IWYU pragma: export
22+
#import "UIImage+MaterialRTL.h" // IWYU pragma: export
23+
#import "UIView+MaterialRTL.h" // IWYU pragma: export
2424

2525
//! Project version number for MDFInternationalization.
2626
FOUNDATION_EXPORT double MDFInternationalizationVersionNumber;

0 commit comments

Comments
 (0)