Skip to content

Feature module migration #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frogermcs merged 3 commits into from
Dec 12, 2019
Merged

Feature module migration #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a84fe1c
incremental annotation processing fix
frogermcs Nov 9, 2019
da74688
no build system warnings related to com.android.feature
frogermcs Nov 9, 2019
7743954
updated dependencies
frogermcs Nov 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@ android {

release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt') ,
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard-rules.pro'
}
}

packagingOptions {
exclude 'META-INF/androidx.legacy_legacy-support-core-utils.version'
}

dynamicFeatures = []

}

dependencies {
implementation project(':features:base')
implementation project(':features:repositories')
implementation project(':features:repository')

rootProject.app.each { item ->
add(item.configuration, item.dependency, item.options)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'org.jacoco:org.jacoco.core:0.8.5'
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.0'
classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0"
Expand Down
5 changes: 5 additions & 0 deletions buildsystem/android_commons.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ android {
}
}
}

packagingOptions {
//Bugfix for AutoValue 1.7rc1 and AutoFactory 1.0-beta7 in one project
exclude 'META-INF/gradle/incremental.annotation.processors'
}
}
16 changes: 11 additions & 5 deletions buildsystem/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,26 @@ ext {
//

//Annotation processor dependencies
daggerVersion = '2.24'
daggerVersion = '2.25.2'
autoFactoryVersion = '1.0-beta7'
autoValueVersion = "1.7"
butterknifeVersion = '10.2.0'

//Standard dependencies
supportLibraryVersion = '1.0.0'
supportLibraryVersion = '1.1.0'
javaxAnnotationsVersion = '10.0-b28'
autoFactoryVersion = '1.0-beta7'
rxAndroidVersion = '1.2.1'
rxJavaVersion = '1.3.8'
rxBindingVersion = '1.0.1'
timberVersion = '4.7.1'
retrofitVersion = '2.6.2'
gsonVersion = '2.3.0'
gsonVersion = '2.6.2'
okhttpVersion = '4.2.2'
guavaVersion = '28.1-android'

// Testing dependencies
junitVersion = '4.13-beta-3'
junitVersion = '4.13-rc-1'
mockitoVersion = '3.1.0'

//Functional/end-to-end testing dependencies
Expand All @@ -41,12 +42,14 @@ ext {

//Standard dependencies
appCompat = "androidx.appcompat:appcompat:${supportLibraryVersion}"
recyclerView = "androidx.recyclerview:recyclerview:${supportLibraryVersion}"
recyclerView = "androidx.recyclerview:recyclerview:1.1.0-rc01"

butterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
dagger = "com.google.dagger:dagger:${daggerVersion}"
javaxAnnotations = "org.glassfish:javax.annotation:${javaxAnnotationsVersion}"
autoFactory = "com.google.auto.factory:auto-factory:${autoFactoryVersion}"
autoValue = "com.google.auto.value:auto-value:${autoValueVersion}"
autoValueAnnotations = "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
rxAndroid = "io.reactivex:rxandroid:${rxAndroidVersion}"
rxJava = "io.reactivex:rxjava:${rxJavaVersion}"
rxBinding = "com.jakewharton.rxbinding:rxbinding:${rxBindingVersion}"
Expand Down Expand Up @@ -96,6 +99,8 @@ ext {
[configuration: "api", dependency: dagger],
[configuration: "api", dependency: javaxAnnotations],
[configuration: "api", dependency: autoFactory],
[configuration: "api", dependency: autoValue],
[configuration: "api", dependency: autoValueAnnotations],
[configuration: "api", dependency: rxAndroid],
[configuration: "api", dependency: rxJava],
[configuration: "api", dependency: rxBinding],
Expand Down Expand Up @@ -128,5 +133,6 @@ ext {
[configuration: "annotationProcessor", dependency: autoFactoryCompiler],
[configuration: "annotationProcessor", dependency: daggerCompiler],
[configuration: "annotationProcessor", dependency: butterknifeCompiler],
[configuration: "annotationProcessor", dependency: autoValue],
]
}
8 changes: 1 addition & 7 deletions features/base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
apply plugin: 'com.android.feature'
apply plugin: 'com.android.library'
apply plugin: 'jacoco'

apply from: '../../buildsystem/android_commons.gradle'

android {
baseFeature true

buildTypes {
all {
consumerProguardFiles 'feature-base-proguard-rules.pro'
Expand All @@ -14,10 +12,6 @@ android {
}

dependencies {
application project(':app')
feature project(":features:repositories")
feature project(":features:repository")

rootProject.base.each { item ->
add(item.configuration, item.dependency, item.options)
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/frogermcs/multimodulegithubclient/base/data/api/NetworkingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public OkHttpClient provideOkHttpClient(HttpLoggingInterceptor httpLoggingInterc
@Singleton
public HttpLoggingInterceptor provideHttpLoggingInterceptor() {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
logging.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
logging.level(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
return logging;
}

Expand Down
2 changes: 1 addition & 1 deletion features/repositories/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.feature'
apply plugin: 'com.android.library'
apply plugin: 'com.jakewharton.butterknife'
apply plugin: 'jacoco'

Expand Down
2 changes: 1 addition & 1 deletion features/repository/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'com.android.feature'
apply plugin: 'com.android.library'
apply plugin: 'com.jakewharton.butterknife'
apply plugin: 'jacoco'

Expand Down