diff --git a/lib_network/.gitignore b/lib_network/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/lib_network/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/lib_network/build.gradle b/lib_network/build.gradle deleted file mode 100644 index ed3b630c5..000000000 --- a/lib_network/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' -} - -android { - compileSdkVersion project.compileSdkVersion - - defaultConfig { - minSdkVersion project.minSdkVersion - targetSdkVersion project.targetSdkVersion - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - } - - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - -} - -dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - - implementation 'com.squareup.retrofit2:retrofit:2.3.0' -} diff --git a/lib_network/proguard-rules.pro b/lib_network/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/lib_network/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/lib_network/src/main/AndroidManifest.xml b/lib_network/src/main/AndroidManifest.xml deleted file mode 100644 index f180141e4..000000000 --- a/lib_network/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/lib_network/src/test/java/gov/anzong/androidnga/http/ExampleUnitTest.java b/lib_network/src/test/java/gov/anzong/androidnga/http/ExampleUnitTest.java deleted file mode 100644 index 316e6a067..000000000 --- a/lib_network/src/test/java/gov/anzong/androidnga/http/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package gov.anzong.androidnga.http; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/nga_phone_base_3.0/build.gradle b/nga_phone_base_3.0/build.gradle index 1c1f3a60c..fdbd70379 100644 --- a/nga_phone_base_3.0/build.gradle +++ b/nga_phone_base_3.0/build.gradle @@ -134,7 +134,6 @@ dependencies { implementation project(':lib_common') implementation project(':lib_cloud') implementation project(':lib_core') - implementation project(":lib_network") // database implementation "androidx.room:room-runtime:$room_version" diff --git a/lib_network/src/main/java/gov/anzong/androidnga/http/OnHttpCallBack.java b/nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/http/OnHttpCallBack.java similarity index 100% rename from lib_network/src/main/java/gov/anzong/androidnga/http/OnHttpCallBack.java rename to nga_phone_base_3.0/src/main/java/gov/anzong/androidnga/http/OnHttpCallBack.java diff --git a/settings.gradle b/settings.gradle index 0f25a2f63..8a77b6287 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ include ':lib_cloud', ':lib_common' include ':nga_phone_base_3.0' include ':lib_core' -include ':lib_network'