Skip to content
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.

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

Removed robolectric and electricspock dependency #770

Merged
merged 28 commits into from
May 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
82a2a1c
Updated gradle and gradle wrapper
nrbrook Aug 14, 2021
f107c99
Changed Java version to Java 11
nrbrook Aug 14, 2021
78a1d7e
Updated compile and target SDK versions
nrbrook Aug 14, 2021
b206615
Switched to maven-publish plugin
nrbrook Aug 14, 2021
1d98987
Updated java version in github actions
nrbrook Aug 14, 2021
fb5be9a
Merge branch 'master' into gradle-7
nrbrook Oct 28, 2021
308121c
Replaced jcenter with mavenCentral
nrbrook Oct 28, 2021
6b3cc98
Updated kotlin version
nrbrook Oct 28, 2021
af76ae8
Updated gradle
nrbrook Oct 28, 2021
f061f03
Updated recyclerview
nrbrook Oct 28, 2021
161a53a
Removed robolectric and electricspock dependency
nrbrook Nov 8, 2021
bc9e9dd
Fixed sample tests
nrbrook Nov 13, 2021
6286b5d
Upgrade java version to fix error
nrbrook Nov 13, 2021
1a76c42
Merge branch 'master' into unit-tests-without-robo
nrbrook Nov 13, 2021
0353e58
Merge branch 'unit-tests-without-robo' into gradle-7
nrbrook Nov 13, 2021
ed15306
Remove afterEvaluate
nrbrook Nov 13, 2021
cb53b1a
Added stub class usage info
nrbrook Nov 13, 2021
9ed08d6
Updated Kotlin version
nrbrook Nov 24, 2021
f11bf74
Updated gradle version
nrbrook Dec 10, 2021
a0ccc06
Gradle update
nrbrook Feb 22, 2022
5df8f26
Gradle update
nrbrook Feb 25, 2022
b3a376d
Fix javadocs
nrbrook Mar 3, 2022
5575570
Fix javadocs
nrbrook Mar 3, 2022
02f4118
Fixes for java docs
nrbrook Mar 3, 2022
af20fd9
Update dagger version
nrbrook Mar 18, 2022
7885671
Dependency updates
nrbrook Mar 18, 2022
6d9036c
Fix classpath
nrbrook Mar 23, 2022
03bfbc2
Merge branch 'gradle-7' into unit-tests-without-robo
nrbrook Mar 23, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/gradle-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- name: "Checkout Repository"
uses: actions/checkout@v2
- name: "Set up Android JDK environment"
uses: actions/setup-java@v2.1.0
uses: actions/setup-java@v2.2.0
with:
distribution: 'adopt'
java-version: '8'
java-version: '11'
java-package: jdk
- name: "Run Checkstyle"
run: ./gradlew checkstyle
Expand Down
31 changes: 26 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ apply from: 'dependencies.gradle'
apply from: 'checkstyle.gradle'

buildscript {
ext.kotlinVersion = '1.5.21'
ext.kotlinVersion = '1.6.10'
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
classpath 'gradle.plugin.org.codehaus.groovy:groovy-android-gradle-plugin:3.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
Expand All @@ -24,17 +24,27 @@ allprojects {

repositories {
google()
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
maven { url 'https://jitpack.io' }
mavenCentral()
}

buildscript {
repositories {
google()
jcenter()
}
}

configurations {
doclava
}

dependencies {
doclava 'com.google.doclava:doclava:1.0.6'
}

dependencyUpdates.resolutionStrategy {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
Expand All @@ -52,7 +62,18 @@ allprojects {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
}

tasks.withType(Test) {
useJUnitPlatform()
testLogging {
exceptionFormat "full"
events "started", "skipped", "passed", "failed"
showStandardStreams true
}
}
}


}

task clean(type: Delete) {
Expand Down
11 changes: 9 additions & 2 deletions dagger-compiler-shadow/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
buildscript {
repositories {
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:$rootProject.ext.shadowPluginVersion"
classpath "gradle.plugin.com.github.johnrengelman:shadow:$rootProject.ext.shadowPluginVersion"
}
}

Expand All @@ -23,3 +25,8 @@ shadowJar {
dependencies {
implementation rootProject.ext.libs.dagger_compiler
}

java {
sourceCompatibility = rootProject.ext.sourceCompatibilityVersion
targetCompatibility = rootProject.ext.targetCompatibilityVersion
}
11 changes: 9 additions & 2 deletions dagger-library-shadow/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
buildscript {
repositories {
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:$rootProject.ext.shadowPluginVersion"
classpath "gradle.plugin.com.github.johnrengelman:shadow:$rootProject.ext.shadowPluginVersion"
}
}

Expand All @@ -28,3 +30,8 @@ artifacts {
dependencies {
implementation rootProject.ext.libs.dagger
}

java {
sourceCompatibility = rootProject.ext.sourceCompatibilityVersion
targetCompatibility = rootProject.ext.targetCompatibilityVersion
}
18 changes: 7 additions & 11 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
ext {
rxJavaVersion = '2.2.17'
sourceCompatibilityVersion = JavaVersion.VERSION_1_7
targetCompatibilityVersion = JavaVersion.VERSION_1_7
shadowPluginVersion = '5.0.0'
daggerVersion = '2.15'
sourceCompatibilityVersion = JavaVersion.VERSION_1_8
targetCompatibilityVersion = JavaVersion.VERSION_1_8
shadowPluginVersion = '7.1.2'
daggerVersion = '2.41'
libs = [
/* Library-only dependencies */
rxjava : "io.reactivex.rxjava2:rxjava:$rxJavaVersion",
rxandroid : 'io.reactivex.rxjava2:rxandroid:2.1.1',
rxrelay : 'com.jakewharton.rxrelay2:rxrelay:2.1.1',
junit : 'junit:junit:4.13',
groovy : 'org.codehaus.groovy:groovy:2.5.8',
spock : ['org.spockframework:spock-core:1.2-groovy-2.5',
'cglib:cglib-nodep:3.3.0',
'org.objenesis:objenesis:2.6'],
electricspock : 'com.github.hkhc:electricspock:0.9',
junit : 'org.junit.jupiter:junit-jupiter:5.8.1',
groovy : ['org.codehaus.groovy:groovy:3.0.9', 'org.codehaus.groovy:groovy-test:3.0.9'],
spock : 'org.spockframework:spock-core:2.0-groovy-3.0',
dagger : "com.google.dagger:dagger:$daggerVersion",
dagger_compiler : "com.google.dagger:dagger-compiler:$daggerVersion",
/* Shared library-sample apps dependencies */
annotations : "androidx.annotation:annotation:1.1.0",
robolectric : 'org.robolectric:robolectric:3.8',
/* Sample apps-only dependencies */
rxjava_replayingshare : 'com.jakewharton.rx2:replaying-share:2.2.0',
rxjava_binding : 'com.jakewharton.rxbinding3:rxbinding:3.1.0',
Expand Down
Loading