Skip to content

Commit

Permalink
Last migration (#58)
Browse files Browse the repository at this point in the history
* FRagments migrated

* Restoring GetImage.java

* Restoring java getimage test

* To spaces

* Indentation

* Reformat

* Code reformats

* fixing tests

* Last migration

* Kotlin migration fixes - update versions (#59)

* Fixing overriding base presenter

* Presenter as val

* Fix tests

* Get presnter instead of require

* Fixing wolmo fragment inject

* DefaultModule as class

* Shared preferences string nullable

* Android core as api

* Reverting modules

* Updating version

* Updating versions

* Fixing tests

* Using implmentation

* API insteda of implementation revert
  • Loading branch information
dylan-muszel committed Dec 19, 2019
1 parent 5273483 commit 1042ff9
Show file tree
Hide file tree
Showing 30 changed files with 811 additions and 1,198 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.31'
ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
25 changes: 16 additions & 9 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ apply plugin: 'jacoco-android'
apply plugin: 'com.github.kt3k.coveralls'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.2'
testOptions.unitTests.includeAndroidResources = true

compileOptions {
Expand All @@ -15,7 +15,7 @@ android {

defaultConfig {
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
consumerProguardFiles 'proguard-joda-time.pro', 'proguard-dagger.pro'
}

Expand All @@ -37,14 +37,15 @@ coveralls {
}

buildscript {
ext.androidx_appcompat_version = '1.0.2'
ext.dagger_version = '2.22.1'
ext.androidx_appcompat_version = '1.1.0'
ext.dagger_version = '2.25.3'
ext.powermock_version = '1.7.0'
ext.junit_version = '4.12'
ext.robolectric_version = '4.2'
ext.robolectric_version = '4.3.1'
ext.androidx_test_core_version = '1.1.0'
ext.mockito_inline_version = '2.13.0'
ext.assertj_version = '3.9.0';
ext.assertj_version = '3.9.0'
ext.android_ktx_version = '1.1.0'
}

dependencies {
Expand All @@ -58,7 +59,8 @@ dependencies {

// Testing as api to let tests package use it
api "junit:junit:$junit_version"
api "org.mockito:mockito-inline:$mockito_inline_version" // Mockito inline adds support for mocking final classes and methods
// Mockito inline adds support for mocking final classes and methods
api "org.mockito:mockito-inline:$mockito_inline_version"

// Dagger
api "com.google.dagger:dagger:$dagger_version"
Expand All @@ -67,11 +69,16 @@ dependencies {
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"

// Android KTX
api "androidx.core:core-ktx:$android_ktx_version"
api "androidx.fragment:fragment-ktx:$android_ktx_version"

// Test
testImplementation "junit:junit:$junit_version"
testImplementation "org.robolectric:robolectric:$robolectric_version"
testImplementation "androidx.test:core:$androidx_test_core_version"
testImplementation "org.mockito:mockito-inline:$mockito_inline_version" // Mockito inline adds support for mocking final classes and methods
testImplementation "org.mockito:mockito-inline:$mockito_inline_version"
// Mockito inline adds support for mocking final classes and methods
testImplementation "org.assertj:assertj-core:$assertj_version"
testAnnotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
testAnnotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
Expand Down
195 changes: 0 additions & 195 deletions core/src/main/java/ar/com/wolox/wolmo/core/activity/WolmoActivity.java

This file was deleted.

0 comments on commit 1042ff9

Please sign in to comment.