Skip to content

Commit a386df6

Browse files
paulb777andrewheard
authored andcommitted
Vertex AI preview versioning (#12691)
1 parent 1007a29 commit a386df6

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

FirebaseCore/Sources/FIROptions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ - (NSString *)libraryVersionID {
284284
// The unit tests are set up to catch anything that does not properly convert.
285285
NSString *version = FIRFirebaseVersion();
286286
NSArray *components = [version componentsSeparatedByString:@"."];
287-
NSString *major = [components objectAtIndex:0];
287+
NSString *major = [NSString stringWithFormat:@"%02d", [[components objectAtIndex:0] intValue]];
288288
NSString *minor = [NSString stringWithFormat:@"%02d", [[components objectAtIndex:1] intValue]];
289289
NSString *patch = [NSString stringWithFormat:@"%02d", [[components objectAtIndex:2] intValue]];
290290
kFIRLibraryVersionID = [NSString stringWithFormat:@"%@%@%@000", major, minor, patch];

FirebaseCore/Tests/Unit/FIROptionsTest.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ - (void)testVersionConsistency {
624624
int minor = (versionString[2] - '0') * 10 + versionString[3] - '0';
625625
int patch = (versionString[4] - '0') * 10 + versionString[5] - '0';
626626
NSString *str = [NSString stringWithFormat:@"%d.%d.%d", major, minor, patch];
627-
XCTAssertEqualObjects(str, FIRFirebaseVersion());
627+
XCTAssertTrue([FIRFirebaseVersion() hasPrefix:str]);
628628
}
629629

630630
// Repeat test with more Objective-C.
@@ -638,11 +638,11 @@ - (void)testVersionConsistency2 {
638638
NSRange major = NSMakeRange(0, 2);
639639
NSRange minor = NSMakeRange(2, 2);
640640
NSRange patch = NSMakeRange(4, 2);
641-
NSString *str =
642-
[NSString stringWithFormat:@"%@.%d.%d", [kFIRLibraryVersionID substringWithRange:major],
643-
[[kFIRLibraryVersionID substringWithRange:minor] intValue],
644-
[[kFIRLibraryVersionID substringWithRange:patch] intValue]];
645-
XCTAssertEqualObjects(str, FIRFirebaseVersion());
641+
NSString *str = [NSString
642+
stringWithFormat:@"%d.%d.%d", [[kFIRLibraryVersionID substringWithRange:major] intValue],
643+
[[kFIRLibraryVersionID substringWithRange:minor] intValue],
644+
[[kFIRLibraryVersionID substringWithRange:patch] intValue]];
645+
XCTAssertTrue([FIRFirebaseVersion() hasPrefix:str]);
646646
}
647647

648648
#pragma mark - Helpers

SwiftPMTests/swift-test/all-imports.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ class importTest: XCTestCase {
7676

7777
let versionParts = FirebaseVersion().split(separator: ".")
7878
XCTAssert(versionParts.count == 3)
79-
XCTAssertEqual(Int(versionParts[0]), 10)
79+
XCTAssertNotNil(Int(versionParts[0]))
8080
XCTAssertNotNil(Int(versionParts[1]))
81-
XCTAssertNotNil(Int(versionParts[2]))
8281

8382
print("System version? Answer: \(GULAppEnvironmentUtil.systemVersion())")
8483
}

0 commit comments

Comments
 (0)