Merge remote-tracking branch 'origin/develop' into integrate/Aztec-1.…

…19.3
wordpress-mobile · Jul 10, 2020 · b22df36 · b22df36
2 parents 3a7becd + 5155c82
commit b22df36
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Podfile b/Podfile
@@ -189,7 +189,7 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 1.0.1'
 
-    pod 'WordPressAuthenticator', '~> 1.20.0-beta.3'
+    pod 'WordPressAuthenticator', '~> 1.20.0-beta'
     # While in PR
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''

diff --git a/Podfile.lock b/Podfile.lock
@@ -385,7 +385,7 @@ PODS:
   - WordPress-Aztec-iOS (1.19.3)
   - WordPress-Editor-iOS (1.19.3):
     - WordPress-Aztec-iOS (= 1.19.3)
-  - WordPressAuthenticator (1.20.0-beta.3):
+  - WordPressAuthenticator (1.20.0-beta.7):
     - 1PasswordExtension (= 1.8.6)
     - Alamofire (= 4.8)
     - CocoaLumberjack (~> 3.5)
@@ -490,7 +490,7 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.3)
-  - WordPressAuthenticator (~> 1.20.0-beta.3)
+  - WordPressAuthenticator (~> 1.20.0-beta)
   - WordPressKit (= 4.12.0-beta.1)
   - WordPressMocks (~> 0.0.8)
   - WordPressShared (= 1.9.1)
@@ -722,7 +722,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f
   WordPress-Editor-iOS: 1886f7fe464d79ee64ccfe7985281f8cf45f75eb
-  WordPressAuthenticator: 02cb261da08b4610f5720067983eb19fb167f14c
+  WordPressAuthenticator: f3e52bbbe3c8d2b363b09e6aa6b36a927967e3f0
   WordPressKit: c10ba341c1490cbb30a52a10a1750e8f56a15fb9
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
   WordPressShared: 423779c24b1f8f2ee06d1068d30c7d2ea51ca813
@@ -739,6 +739,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
   ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
-PODFILE CHECKSUM: 619fcd5c97f0d1471daba2af298b4c1d9e21682e
+PODFILE CHECKSUM: 690274f98dc8a92a506be26cc34d89d42f0a57b3
 
 COCOAPODS: 1.8.4
diff --git a/WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift b/WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift
@@ -76,8 +76,8 @@ class WordPressAuthenticationManager: NSObject {
                                                               textButtonHighlightColor: .brand,
                                                               viewControllerBackgroundColor: .basicBackground,
                                                               navBarBackgroundColor: .basicBackground,
-                                                              navButtonTextColor: .barButtonItemTitle,
-                                                              largeTitleTextColor: .text)
+                                                              navButtonTextColor: .brand,
+                                                              navTitleTextColor: .text)
 
         WordPressAuthenticator.initialize(configuration: configuration,
                                           style: style,

diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=15.2
 
 // Internal long version example: VERSION_LONG=9.9.0.20180423
-VERSION_LONG=15.2.0.20200703
+VERSION_LONG=15.2.0.20200708
diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig
@@ -1,4 +1,4 @@
 VERSION_SHORT=15.2
 
 // Public long version example: VERSION_LONG=9.9.0.0
-VERSION_LONG=15.2.0.1
+VERSION_LONG=15.2.0.3