From a90c6a2df07d36c48e85ae9e1e36e3570daa48cd Mon Sep 17 00:00:00 2001 From: Davidodari Date: Wed, 10 Jun 2020 14:53:29 +0300 Subject: [PATCH 1/6] remove starwars from resources --- app/src/main/res/layout/activity_dashboard.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml index 520b8e94..0ebda0e6 100644 --- a/app/src/main/res/layout/activity_dashboard.xml +++ b/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" /> Character Name Favorites Favorites - Explore StarWars Characters. + Explore Settings From ee8dd98f590be27ac8347fedd8dbfc2e4bb730a8 Mon Sep 17 00:00:00 2001 From: Davidodari Date: Wed, 10 Jun 2020 14:57:10 +0300 Subject: [PATCH 2/6] version bump to 2.1.2 --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e4c6c8e0..2053ef03 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,7 +8,7 @@ ext { //App Versioning versionCodeMajor = 2 versionCodeMinor = 1 - versionCodePatch = 1 + versionCodePatch = 2 versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch" //Dependencies Version - Presentation From 6ca0dd03961faae659aa38bf6e11c646f0d7dae0 Mon Sep 17 00:00:00 2001 From: Davidodari Date: Wed, 10 Jun 2020 15:11:22 +0300 Subject: [PATCH 3/6] cleanup dependencies --- build.gradle | 7 +------ dependencies.gradle | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 52077ed1..6cf53033 100644 --- a/build.gradle +++ b/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" diff --git a/dependencies.gradle b/dependencies.gradle index 2053ef03..aa350b89 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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' From 842cc39bcaf8db66fbbaa5339d49fa8160d29e49 Mon Sep 17 00:00:00 2001 From: Davidodari Date: Sat, 13 Jun 2020 18:43:40 +0300 Subject: [PATCH 4/6] remove network_security_config.xml from release manifest --- app/src/debug/AndroidManifest.xml | 4 ++++ app/src/debug/res/xml/network_security_config.xml | 3 --- app/src/main/AndroidManifest.xml | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 app/src/debug/AndroidManifest.xml diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..f5d66495 --- /dev/null +++ b/app/src/debug/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml index 5b50736f..ddbbcbfe 100644 --- a/app/src/debug/res/xml/network_security_config.xml +++ b/app/src/debug/res/xml/network_security_config.xml @@ -12,9 +12,6 @@ --> - - swapi.dev - localhost diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc0e66ea..014e8f01 100644 --- a/app/src/main/AndroidManifest.xml +++ b/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"> From 9f11a86afe3fcecfcc19f13818fb1e91077a87d8 Mon Sep 17 00:00:00 2001 From: Davidodari Date: Sat, 13 Jun 2020 18:44:11 +0300 Subject: [PATCH 5/6] version bump to 2.1.3 --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index aa350b89..e885a804 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,7 +8,7 @@ ext { //App Versioning versionCodeMajor = 2 versionCodeMinor = 1 - versionCodePatch = 2 + versionCodePatch = 3 versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch" //Dependencies Version - Presentation From b06a64daa06e980231dba968dfccdaa5848b8e81 Mon Sep 17 00:00:00 2001 From: Davidodari Date: Sat, 13 Jun 2020 18:54:22 +0300 Subject: [PATCH 6/6] disable release prerequisites for travis --- .travis.yml | 8 ++++---- app/build.gradle | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66cc24ce..c6658aab 100644 --- a/.travis.yml +++ b/.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 diff --git a/app/build.gradle b/app/build.gradle index bf604d52..77da67f7 100644 --- a/app/build.gradle +++ b/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 {