From 330370868078e34018e12e757e59a0dc0997dfeb Mon Sep 17 00:00:00 2001 From: omeriyioz Date: Wed, 18 Dec 2019 01:00:33 +0300 Subject: [PATCH] dependencies upgraded. --- .gitignore | 9 - .idea/gradle.xml | 18 -- .../markdown-navigator/profiles_settings.xml | 3 - .idea/misc.xml | 128 -------------- .idea/modules.xml | 9 - .idea/runConfigurations.xml | 12 -- app/.gitignore | 1 - app/build.gradle | 23 ++- .../ui/detail/DetailActivity.java | 2 +- .../ui/detail/fragment/DetailFragment.java | 2 +- .../ui/main/MainActivity.java | 2 +- app/src/main/res/layout/activity_main.xml | 1 + build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 160 ------------------ 15 files changed, 20 insertions(+), 358 deletions(-) delete mode 100644 .gitignore delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/markdown-navigator/profiles_settings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 app/.gitignore delete mode 100755 gradlew diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 39fb081..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures -.externalNativeBuild diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7ac24c7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml deleted file mode 100644 index 57927c5..0000000 --- a/.idea/markdown-navigator/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 47394c9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.8 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 1c3f8c5..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/build.gradle b/app/build.gradle index 25079b4..232f65e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 28 defaultConfig { applicationId "iammert.com.dagger_android_injection" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,16 +19,16 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.4.0' - testCompile 'junit:junit:4.12' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:appcompat-v7:28.0.0' + testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.google.dagger:dagger:2.13' - annotationProcessor 'com.google.dagger:dagger-compiler:2.13' - annotationProcessor 'com.google.dagger:dagger-android-processor:2.13' - compile 'com.google.dagger:dagger-android-support:2.13' + implementation 'com.google.dagger:dagger:2.25.2' + annotationProcessor 'com.google.dagger:dagger-compiler:2.24' + annotationProcessor 'com.google.dagger:dagger-android-processor:2.23.2' + implementation 'com.google.dagger:dagger-android-support:2.24' } diff --git a/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/DetailActivity.java b/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/DetailActivity.java index c12c782..b2b9adf 100644 --- a/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/DetailActivity.java +++ b/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/DetailActivity.java @@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onDetailLoaded() { - Log.v("TEST", "Detail is loaded"); + Log.v("TEST-I-AM-MERT", "Detail is loaded"); } } diff --git a/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/fragment/DetailFragment.java b/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/fragment/DetailFragment.java index 57a85a2..3e0ccb3 100644 --- a/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/fragment/DetailFragment.java +++ b/app/src/main/java/iammert/com/dagger_android_injection/ui/detail/fragment/DetailFragment.java @@ -41,6 +41,6 @@ public void onAttach(Context context) { @Override public void onDetailFragmentLoaded() { - Log.v("TEST", "OnDetailFragmentLoaded."); + Log.v("TEST-I-AM-MERT", "OnDetailFragmentLoaded."); } } diff --git a/app/src/main/java/iammert/com/dagger_android_injection/ui/main/MainActivity.java b/app/src/main/java/iammert/com/dagger_android_injection/ui/main/MainActivity.java index fbb8c53..5e12824 100644 --- a/app/src/main/java/iammert/com/dagger_android_injection/ui/main/MainActivity.java +++ b/app/src/main/java/iammert/com/dagger_android_injection/ui/main/MainActivity.java @@ -33,6 +33,6 @@ public void onClick(View v) { @Override public void onMainLoaded() { - Log.v("TEST", "Main page is loaded."); + Log.v("TEST-I-AM-MERT", "Main page is loaded."); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2b8771f..8540bab 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,6 +13,7 @@