Merge pull request #100 from odaridavid/attempt-playstore-fix

Attempt playstore policy fix

Author: odaridavid

.travis.yml

@@ -17,10 +17,10 @@ android:
     - android-sdk-preview-license-.+
     - android-sdk-license-.+
     - google-gdk-license-.+
-before_install:
-  - openssl aes-256-cbc -K $encrypted_50477c21cd2c_key -iv $encrypted_50477c21cd2c_iv
-    -in secrets.tar.enc -out secrets.tar -d
-  - tar xvf secrets.tar
+#before_install:
+#  - openssl aes-256-cbc -K $encrypted_50477c21cd2c_key -iv $encrypted_50477c21cd2c_iv
+#    -in secrets.tar.enc -out secrets.tar -d
+#  - tar xvf secrets.tar
 script:
   - "./gradlew build jacocoTestReport assembleAndroidTest"
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI

app/build.gradle

@@ -37,23 +37,23 @@ jacocoAndroidUnitTestReport {
     xml.enabled true
 }
 
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+//def keystorePropertiesFile = rootProject.file("keystore.properties")
+//def keystoreProperties = new Properties()
+//keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
+//    signingConfigs {
+//        release {
+//            keyAlias keystoreProperties['keyAlias']
+//            keyPassword keystoreProperties['keyPassword']
+//            storeFile file(keystoreProperties['storeFile'])
+//            storePassword keystoreProperties['storePassword']
+//        }
+//    }
 
     defaultConfig {
         applicationId "com.k0d4black.theforce"
@@ -70,7 +70,7 @@ android {
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             manifestPlaceholders = [crashlyticsEnabled: true]
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
         }
 
         debug {

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+</manifest>

app/src/debug/res/xml/network_security_config.xml

@@ -12,9 +12,6 @@
 
 -->
 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">swapi.dev</domain>
-    </domain-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">localhost</domain>
     </domain-config>

app/src/main/AndroidManifest.xml

@@ -20,7 +20,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">
         <activity android:name=".base.BaseActivity" />

app/src/main/res/layout/activity_dashboard.xml

@@ -45,7 +45,7 @@
             android:id="@+id/search_tagline_text_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/explore_starwars_characters"
+            android:text="@string/info_explore"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" />
 
         <EditText

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

@@ -23,7 +23,7 @@
     <string name="hint_character_name">Character Name</string>
     <string name="title_favorites">Favorites</string>
     <string name="menu_title_favorites">Favorites</string>
-    <string name="explore_starwars_characters">Explore StarWars Characters.</string>
+    <string name="info_explore">Explore</string>
 
     <!-- DashboardSearchViewState Activity Menu -->
     <string name="menu_title_settings">Settings</string>

build.gradle

@@ -15,21 +15,16 @@ apply from: 'dependencies.gradle'
 
 buildscript {
     ext {
-        kotlin_version = '1.3.72'
+        kotlinVersion = '1.3.72'
     }
-    ext.kotlinVersion = '1.3.61'
     repositories {
         google()
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public'
-        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.31.2'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.1.2"

dependencies.gradle

@@ -8,7 +8,7 @@ ext {
     //App Versioning
     versionCodeMajor = 2
     versionCodeMinor = 1
-    versionCodePatch = 1
+    versionCodePatch = 3
     versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch"
 
     //Dependencies Version - Presentation
@@ -34,6 +34,9 @@ ext {
     loggingInterceptorVersion = '4.2.1'
     roomVersion = '2.2.5'
 
+    //Domain
+    coroutinesCoreVersion = '1.3.3'
+
     //Testing
     mockitoVersion = '3.2.4'
     junitVersion = '4.12'
@@ -42,8 +45,6 @@ ext {
     truthVersion = '1.0'
     mockitoInlineVersion = '2.13.0'
     mockWebServerVersion = '4.2.1'
-    coroutinesCoreVersion = '1.3.3'
-    coroutinesCoreVersion = '1.3.3'
     robolectricVersion = '4.3'
     androidxTestCoreVersion = '1.0.0'
     runnerVersion = '1.2.0'