Release Parent 3.3.6 (41)

instructure · Nov 17, 2021 · ccbe564 · ccbe564
1 parent 02419c2
commit ccbe564
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apps/flutter_parent/android/app/build.gradle b/apps/flutter_parent/android/app/build.gradle
@@ -92,7 +92,7 @@ dependencies {
 
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation "com.squareup.okhttp3:okhttp:3.13.1"
+    implementation "com.squareup.okhttp3:okhttp:4.9.1"
     implementation 'org.jsoup:jsoup:1.11.3'
     implementation 'com.google.gms:google-services:4.3.3'
 }

diff --git a/...parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/DataSeedingPlugin.kt b/...parent/android/app/src/main/kotlin/com/instructure/parentapp/plugins/DataSeedingPlugin.kt
@@ -5,6 +5,7 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import org.jsoup.Connection
 import org.jsoup.Jsoup
 import org.jsoup.nodes.FormElement
@@ -62,7 +63,7 @@ object DataSeedingPlugin {
                 val authFormResponse = loginForm.submit().cookies(loginPageResponse.cookies()).execute()
                 val authForm = authFormResponse.parse().select("form").first() as FormElement
                 val responseUrl = authForm.submit().cookies(authFormResponse.cookies()).execute().url().toString()
-                authCode = HttpUrl.parse(responseUrl)?.queryParameter("code")
+                authCode = responseUrl?.toHttpUrlOrNull()?.queryParameter("code")
                     ?: throw RuntimeException("/login/oauth2/auth failed!")
 
                 return null

diff --git a/apps/flutter_parent/pubspec.yaml b/apps/flutter_parent/pubspec.yaml
@@ -25,7 +25,7 @@ description: Canvas Parent
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.3.5+40
+version: 3.3.6+41
 
 module:
   androidX: true