Skip to content

Commit dc2f9ab

Browse files
committed
fix androidTest imports
1 parent 1500e74 commit dc2f9ab

12 files changed

Lines changed: 28 additions & 24 deletions

File tree

benchmarkmicro/src/androidTest/java/com/cherrydev/benchmarkmicro/ExampleBenchmark.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
package com.cherrydev.benchmarkmicro;
22

3+
import static org.junit.Assert.assertEquals;
4+
5+
import android.content.Context;
36
import android.util.Log;
47

58
import androidx.benchmark.BenchmarkState;
69
import androidx.benchmark.junit4.BenchmarkRule;
710
import androidx.test.ext.junit.runners.AndroidJUnit4;
11+
import androidx.test.platform.app.InstrumentationRegistry;
812

913
import org.junit.Rule;
10-
import org.junit.jupiter.api.Test;
14+
import org.junit.Test;
1115
import org.junit.runner.RunWith;
1216

1317
/**

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#checkstyle = "8.37"
44

55
[libraries]
6-
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.4.32" }
6+
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.9.10" }
77
desugar = { module = "com.android.tools:desugar_jdk_libs", version = "1.1.5" }
88
jetbrains-annotations = { module = "org.jetbrains:annotations", version = "15.0" }
99
timber = { module = "com.jakewharton.timber:timber", version = "4.7.1" }
@@ -18,8 +18,8 @@ jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version =
1818
junit4 = { module = "junit:junit", version = "4.13.2" }
1919
jupiter-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version = "5.10.0" }
2020

21-
ext-junit = { module = "androidx.test.ext:junit", version = "1.1.3" }
22-
espresso = { module = "androidx.test.espresso:espresso-core", version = "3.4.0" }
21+
ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
22+
espresso = { module = "androidx.test.espresso:espresso-core", version = "3.5.1" }
2323

2424
#common-tools = { module = "com.cherrydev:tools", version = "0.0.2" }
2525

tools/behavior/src/androidTest/java/com/cherrydev/behavior/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.behavior;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/common/src/androidTest/java/com/cherrydev/common/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.common;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/dialogs/src/androidTest/java/com/cherrydev/dialogs/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.dialogs;
22

3-
import static org.junit.Assert.*;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/file/src/androidTest/java/com/cherrydev/file/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.file;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/keyboard/src/androidTest/java/com/cherrydev/keyboard/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.keyboard;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/navigation/src/androidTest/java/com/cherrydev/navigation/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.navigation;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/network/src/androidTest/java/com/cherrydev/network/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.cherrydev.network;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
3+
import static org.junit.Assert.assertEquals;
44

55
import android.content.Context;
66

77
import androidx.test.ext.junit.runners.AndroidJUnit4;
88
import androidx.test.platform.app.InstrumentationRegistry;
99

10-
import org.junit.jupiter.api.Test;
10+
import org.junit.Test;
1111
import org.junit.runner.RunWith;
1212

1313
/**

tools/recyclerview/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ plugins {
66
apply from: "$rootDir/gradle/android.gradle"
77

88
dependencies {
9-
10-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
9+
implementation(libs.kotlin.stdlib.jdk8)
1110
}

0 commit comments

Comments
 (0)