Merge pull request #2 from hakodeveloper/feature/upgrade-gradle-config

Upgrade Gradle configuration

app/build.gradle

@@ -1,44 +1,60 @@
-plugins {
+apply from: '../versions.gradle'
-  id 'com.android.application'
+apply plugin: 'com.android.application'
-  id 'kotlin-android'
+apply plugin: 'kotlin-android'
-}
+apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion build_versions.target_sdk
-  buildToolsVersion "30.0.3"
+  buildToolsVersion build_versions.build_tools
 
   defaultConfig {
     applicationId "dev.carlos.acronyms"
-    minSdkVersion 21
+    minSdkVersion build_versions.min_sdk
-    targetSdkVersion 30
+    targetSdkVersion build_versions.target_sdk
     versionCode 1
     versionName "1.0"
-
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+    buildConfigField "String", "BASE_ENDPOINT", '"http://www.nactem.ac.uk/software/acromine/"'
   }
 
   buildTypes {
+    debug {
+      applicationIdSuffix '.debug'
+      debuggable true
+      signingConfig signingConfigs.debug
+    }
     release {
-      minifyEnabled false
+      debuggable false
+      minifyEnabled true
+      signingConfig signingConfigs.debug
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
   }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
   kotlinOptions {
-    jvmTarget = '1.8'
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+  }
+
+  testOptions {
+    unitTests.returnDefaultValues = true
+  }
+
+  lintOptions {
+    abortOnError false
+  }
+
+  buildFeatures {
+    viewBinding true
+    dataBinding true
   }
 }
 
 dependencies {
-
+  implementation project(":core")
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation 'androidx.core:core-ktx:1.3.1'
-  implementation 'androidx.appcompat:appcompat:1.2.0'
-  implementation 'com.google.android.material:material:1.3.0'
-  testImplementation 'junit:junit:4.+'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

base.gradle

@@ -0,0 +1,41 @@
+apply from: '../versions.gradle'
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+android {
+  compileSdkVersion build_versions.target_sdk
+  buildToolsVersion build_versions.build_tools
+
+  defaultConfig {
+    minSdkVersion build_versions.min_sdk
+    targetSdkVersion build_versions.target_sdk
+    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+  }
+
+  testOptions {
+    unitTests.returnDefaultValues = true
+  }
+
+  lintOptions {
+    abortOnError false
+  }
+
+  buildFeatures {
+    viewBinding true
+    dataBinding true
+  }
+}
+
+dependencies {
+  kapt deps.core.room.compiler
+}

build.gradle

@@ -1,25 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-  ext.kotlin_version = "1.5.10"
+  apply from: 'versions.gradle'
-  repositories {
-    google()
-    mavenCentral()
-  }
-  dependencies {
-    classpath "com.android.tools.build:gradle:4.2.1"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
-    // NOTE: Do not place your application dependencies here; they belong
+  addRepos(repositories)
-    // in the individual module build.gradle files
+
+  dependencies {
+    classpath deps.project.kotlin
+    classpath deps.project.gradle
   }
+
+  ext.kotlin_version = build_versions.kotlin
 }
 
 allprojects {
-  repositories {
+  addRepos(repositories)
-    google()
-    mavenCentral()
-    jcenter() // Warning: this repository is going to shut down soon
-  }
 }
 
 task clean(type: Delete) {

core/.gitignore

@@ -0,0 +1 @@
+/build

core/build.gradle

@@ -0,0 +1,31 @@
+apply from: '../versions.gradle'
+apply from: '../base.gradle'
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+dependencies {
+  api deps.google.kotlin.std_lib
+  api deps.google.androidx.appcompat
+  api deps.google.androidx.core_ktx
+  api deps.google.androidx.constraint_layout
+  api deps.google.androidx.lifecycle_ext
+  api deps.google.androidx.lifecycle_viewmodel
+  api deps.google.androidx.recycler_view
+  api deps.google.androidx.navigation_fragment
+  api deps.google.androidx.navigation_ui
+  api deps.google.material.core
+  api deps.core.okhttp.logging_interceptor
+  api deps.core.retrofit.runtime
+  api deps.core.retrofit.gson
+  api deps.core.retrofit.rx
+  api deps.core.room.runtime
+  api deps.core.koin.core
+  api deps.core.koin.scope
+  api deps.core.koin.viewmodel
+  api deps.core.rx.core
+  api deps.core.rx.android
+  api deps.core.thirdparty.timber
+
+  kapt deps.core.room.compiler
+}

core/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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

core/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="dev.carlos.core" />

core/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,35 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    >
+  <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startY="49.59793"
+          android:startX="42.9492"
+          android:endY="92.4963"
+          android:endX="85.84757"
+          android:type="linear"
+          >
+        <item
+            android:color="#44000000"
+            android:offset="0.0"
+            />
+        <item
+            android:color="#00000000"
+            android:offset="1.0"
+            />
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeWidth="1"
+      android:strokeColor="#00000000"
+      />
+</vector>

core/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    >
+  <path
+      android:fillColor="#3DDC84"
+      android:pathData="M0,0h108v108h-108z"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M9,0L9,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,0L19,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M29,0L29,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M39,0L39,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M49,0L49,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M59,0L59,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M69,0L69,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M79,0L79,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M89,0L89,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M99,0L99,108"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,9L108,9"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,19L108,19"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,29L108,29"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,39L108,39"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,49L108,49"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,59L108,59"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,69L108,69"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,79L108,79"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,89L108,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M0,99L108,99"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,29L89,29"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,39L89,39"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,49L89,49"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,59L89,59"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,69L89,69"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M19,79L89,79"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M29,19L29,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M39,19L39,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M49,19L49,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M59,19L59,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M69,19L69,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+  <path
+      android:fillColor="#00000000"
+      android:pathData="M79,19L79,89"
+      android:strokeColor="#33FFFFFF"
+      android:strokeWidth="0.8"
+      />
+</vector>

core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background" />
+  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

core/src/main/res/values-night/themes.xml

@@ -0,0 +1,19 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.Acronyms"
+      parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_200</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/black</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_200</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor"
+        tools:targetApi="l">?attr/colorPrimaryVariant
+    </item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>

core/src/main/res/values/colors.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="purple_200">#FFBB86FC</color>
+  <color name="purple_500">#FF6200EE</color>
+  <color name="purple_700">#FF3700B3</color>
+  <color name="teal_200">#FF03DAC5</color>
+  <color name="teal_700">#FF018786</color>
+  <color name="black">#FF000000</color>
+  <color name="white">#FFFFFFFF</color>
+</resources>

core/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">core</string>
+</resources>

core/src/main/res/values/themes.xml

@@ -0,0 +1,19 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Base application theme. -->
+  <style name="Theme.Acronyms"
+      parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <!-- Primary brand color. -->
+    <item name="colorPrimary">@color/purple_500</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
+    <item name="colorOnPrimary">@color/white</item>
+    <!-- Secondary brand color. -->
+    <item name="colorSecondary">@color/teal_200</item>
+    <item name="colorSecondaryVariant">@color/teal_700</item>
+    <item name="colorOnSecondary">@color/black</item>
+    <!-- Status bar color. -->
+    <item name="android:statusBarColor"
+        tools:targetApi="l">?attr/colorPrimaryVariant
+    </item>
+    <!-- Customize your theme here. -->
+  </style>
+</resources>

settings.gradle

@@ -1,2 +1,2 @@
 rootProject.name = "Acronyms"
-include ':app'
+include ':app', ':core'

versions.gradle

@@ -0,0 +1,114 @@
+ext.deps = [:]
+
+def versions = [:]
+versions.kotlin = "1.5.10"
+versions.gradle = "4.2.1"
+versions.room = "2.3.0"
+versions.androidx_appcompat = "1.3.0"
+versions.androidx_core = "1.3.2"
+versions.androidx_constraint_layout = "2.0.4"
+versions.androidx_lifecycle = "2.2.0"
+versions.androidx_recycler_view = "1.2.0"
+versions.androidx_navigation = "2.3.5"
+versions.material_core = "1.3.0"
+versions.okhttp_interceptor = "4.9.1"
+versions.retrofit = "2.9.0"
+versions.timber = "4.7.1"
+versions.koin = "2.2.3"
+versions.rx_core = "2.2.21"
+versions.rx_android = "2.1.1"
+versions.junit = "4.13.2"
+versions.test = "1.3.0"
+versions.test_ext = "1.1.2"
+versions.espresso = "3.3.0"
+
+def build_versions = [:]
+build_versions.min_sdk = 21
+build_versions.target_sdk = 30
+build_versions.build_tools = "30.0.3"
+build_versions.kotlin = "$versions.kotlin"
+ext.build_versions = build_versions
+
+def deps = [:]
+
+def project = [:]
+project.kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
+project.gradle = "com.android.tools.build:gradle:$versions.gradle"
+deps.project = project
+
+def kotlin = [:]
+kotlin.version = "$versions.kotlin"
+kotlin.std_lib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
+
+def androidx = [:]
+androidx.appcompat = "androidx.appcompat:appcompat:$versions.androidx_appcompat"
+androidx.core_ktx = "androidx.core:core-ktx:$versions.androidx_core"
+androidx.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint_layout"
+androidx.lifecycle_ext = "androidx.lifecycle:lifecycle-extensions:$versions.androidx_lifecycle"
+androidx.lifecycle_viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.androidx_lifecycle"
+androidx.recycler_view = "androidx.recyclerview:recyclerview:$versions.androidx_recycler_view"
+androidx.navigation_fragment = "androidx.navigation:navigation-fragment-ktx:$versions.androidx_navigation"
+androidx.navigation_ui = "androidx.navigation:navigation-ui-ktx:$versions.androidx_navigation"
+
+def material = [:]
+material.core = "com.google.android.material:material:$versions.material_core"
+
+def google = [:]
+google.kotlin = kotlin
+google.androidx = androidx
+google.material = material
+deps.google = google
+
+def room = [:]
+room.runtime = "androidx.room:room-runtime:$versions.room"
+room.compiler = "androidx.room:room-compiler:$versions.room"
+
+def koin = [:]
+koin.core = "io.insert-koin:koin-android:$versions.koin"
+koin.scope = "io.insert-koin:koin-androidx-scope:$versions.koin"
+koin.viewmodel = "io.insert-koin:koin-androidx-viewmodel:$versions.koin"
+
+def rx = [:]
+rx.core = "io.reactivex.rxjava2:rxjava:$versions.rx_core"
+rx.android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"
+deps.rx = rx
+
+def okhttp = [:]
+okhttp.logging_interceptor = "com.squareup.okhttp3:logging-interceptor:$versions.okhttp_interceptor"
+
+def retrofit = [:]
+retrofit.runtime = "com.squareup.retrofit2:retrofit:$versions.retrofit"
+retrofit.gson = "com.squareup.retrofit2:converter-gson:$versions.retrofit"
+retrofit.mock = "com.squareup.retrofit2:retrofit-mock:$versions.retrofit"
+retrofit.rx = "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofit"
+
+def thirdparty = [:]
+thirdparty.timber = "com.jakewharton.timber:timber:$versions.timber"
+
+def core = [:]
+core.room = room
+core.koin = koin
+core.rx = rx
+core.okhttp = okhttp
+core.retrofit = retrofit
+core.thirdparty = thirdparty
+deps.core = core
+
+def testing = [:]
+testing.junit = "junit:junit:$versions.junit"
+testing.core = "androidx.test:core:$versions.test"
+testing.rules = "androidx.test:rules:$versions.test"
+testing.runner = "androidx.test:runner:$versions.test"
+testing.ext = "androidx.test.ext:junit:$versions.test_ext"
+testing.koin = "org.koin:koin-test:$versions.koin"
+testing.espresso = "androidx.test.espresso:espresso-core:$versions.espresso"
+deps.testing = testing
+
+ext.deps = deps
+
+static def addRepos(RepositoryHandler handler) {
+  handler.google()
+  handler.mavenCentral()
+}
+
+ext.addRepos = this.&addRepos