Merge pull request #65 from Jiyoung9310/master

OS 9.0 Apache HTTP 대응 #64
droidknights · Mar 29, 2019 · c0d0a77 · c0d0a77
2 parents d673dcc + 60abf13
commit c0d0a77
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -34,6 +34,9 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 android {
     compileSdkVersion 28
 
+    useLibrary 'org.apache.http.legacy'
+
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -44,7 +47,7 @@ android {
 
     defaultConfig {
         applicationId "com.droidknights.flutterdroidknights"
-        minSdkVersion 16
+        minSdkVersion 23
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -84,6 +87,8 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.google.firebase:firebase-core:16.0.1'
+
+    compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:name="io.flutter.app.FlutterApplication"
         android:label="droidknights"
         android:icon="@mipmap/ic_launcher">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <meta-data
           android:name="com.google.android.geo.API_KEY"
           android:value="AIzaSyD5W3yb4jxvq7fjVl-QUOc_f2zSSZ9SWwU" />