diff --git a/.gitignore b/.gitignore
index 39fb081..a04bb24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,14 @@
+# Build files
+build/
+
+# Project setting files
+.idea/
 *.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# OS related files
 .DS_Store
-/build
-/captures
-.externalNativeBuild
+Thumbs.db
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/eomin.xml b/.idea/dictionaries/eomin.xml
deleted file mode 100644
index 1bbd361..0000000
--- a/.idea/dictionaries/eomin.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="eomin" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 44377ec..dfaf8a8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 67a48d2..af0bbdd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,76 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Desktop/1.1.1" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-    <option name="OPTION_INCLUDE_LIBS" value="false" />
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Abstraction issuesJava</id>
-          </State>
-          <State>
-            <id>Android &gt; Lint &gt; Usability</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Numeric issuesJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/DemoApp/.gitignore b/DemoApp/.gitignore
index 796b96d..43383fe 100644
--- a/DemoApp/.gitignore
+++ b/DemoApp/.gitignore
@@ -1 +1,2 @@
-/build
+# Build files
+build/
diff --git a/DemoApp/build.gradle b/DemoApp/build.gradle
index f5699db..488aa53 100644
--- a/DemoApp/build.gradle
+++ b/DemoApp/build.gradle
@@ -1,35 +1,42 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
-    defaultConfig {
-        applicationId "boxresin.library.javahttp"
-        minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    dataBinding {
-        enabled = true
-    }
+	compileSdkVersion 28
+
+	defaultConfig {
+		applicationId "boxresin.library.javahttp"
+		minSdkVersion 14
+		targetSdkVersion 28
+		versionCode 1
+		versionName "1.0.0"
+		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+	}
+
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+		}
+	}
+
+	dataBinding {
+		enabled = true
+	}
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile project(":Library")
-    testCompile 'junit:junit:4.12'
+	// Local JAR & Modules
+	implementation fileTree(dir: 'libs', include: ['*.jar'])
+	implementation project(":Library")
+
+	// AndroidX
+	implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+	implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+	// Test
+	testImplementation 'junit:junit:4.12'
+
+	// Android Test
+	androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
 }
diff --git a/Library/.gitignore b/Library/.gitignore
index 796b96d..43383fe 100644
--- a/Library/.gitignore
+++ b/Library/.gitignore
@@ -1 +1,2 @@
-/build
+# Build files
+build/
diff --git a/Library/build.gradle b/Library/build.gradle
index f199dbd..8ee1e73 100644
--- a/Library/build.gradle
+++ b/Library/build.gradle
@@ -1,23 +1,38 @@
 apply plugin: 'java'
-apply plugin: 'com.novoda.bintray-release'
-
-// How to publish the library
-// ./gradlew clean build bintrayUpload -PbintrayUser=BINTRAY_USERNAME -PbintrayKey=BINTRAY_KEY -PdryRun=false
-publish {
-    userOrg = 'boxresin'
-    groupId = 'boxresin.library'
-    artifactId = 'JavaHTTP'
-    publishVersion = '1.1.1'
-    desc = 'HTTP client library for Java'
-    website = 'https://github.com/BoxResin/JavaHTTP'
-    issueTracker = "https://github.com/BoxResin/JavaHTTP/issues"
-    repository = "https://github.com/BoxResin/JavaHTTP.git"
+apply plugin: 'com.minyushov.bintray'
+
+// Bintray upload setting
+bintrayUpload {
+	// package info
+	groupId = 'boxresin.library'
+	artifactId = 'JavaHTTP'
+	version = '1.2.0'
+
+	// Bintray info
+	repo = 'maven'
+	pkgName = 'JavaHTTP'
+	vcsUrl = 'https://github.com/BoxResin/JavaHTTP.git'
+	license = 'MIT'
+
+	// others
+	dryRun = false // Prevent auto-delivery to Bintray
+	docs = true
+	sources = true
+
+	// 'user' and 'key' should be inputed from the shell
+	user = findProperty('user') ?: 'none'
+	key = findProperty('key') ?: 'none'
 }
 
 dependencies {
-    compile 'org.jetbrains:annotations:15.0' // For @NotNull and @Nullable
-    testCompile 'junit:junit:4.12'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+	// Local JAR files
+	implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+	// For @NotNull and @Nullable
+	implementation 'org.jetbrains:annotations:15.0'
+
+	// Test
+	testImplementation 'junit:junit:4.12'
 }
 
 sourceCompatibility = "1.7"
diff --git a/README.md b/README.md
index a791c37..7ae914a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# JavaHTTP
+**NOTE:** This repository has been deprecated. Use [OkHttp](https://github.com/square/okhttp).
 
 [![Download](https://api.bintray.com/packages/boxresin/maven/JavaHTTP/images/download.svg) ](https://bintray.com/boxresin/maven/JavaHTTP/_latestVersion)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/BoxResin/JavaHTTP/master/LICENSE)
@@ -19,7 +19,7 @@ Add the following to `app`'s `build.gradle` file:
 
 ```gradle
 dependencies { 
-    compile 'boxresin.library:JavaHTTP:1.1.1'
+    implementation 'boxresin.library:JavaHTTP:1.1.1'
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index d73c2a3..dc4dc4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,26 +1,26 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.7.0'
+	repositories {
+		jcenter()
+		google()
+		maven { url 'https://dl.bintray.com/minyushov/gradle' }
+	}
+
+	dependencies {
+		classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
+		classpath 'com.novoda:bintray-release:0.7.0'
 
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+		// Bintray Uploader
+		classpath 'com.minyushov.gradle:bintray:1.1.0'
+	}
 }
 
 allprojects {
-    repositories {
-        jcenter()
-        google()
-    }
+	repositories {
+		jcenter()
+		google()
+	}
 }
 
 task clean(type: Delete) {
-    delete rootProject.buildDir
+	delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..47a56de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,3 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1a7b980..84ae885 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 11 21:14:56 KST 2017
+#Fri Sep 21 22:06:50 KST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip