Skip to content

Commit 597aa7c

Browse files
authored
Modernize test-fixture project. (#465)
1 parent 38164a2 commit 597aa7c

13 files changed

Lines changed: 92 additions & 89 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/setup-java@v4
6060
with:
6161
distribution: 'zulu'
62-
java-version: 23
62+
java-version: 25
6363

6464
- uses: actions/cache@v4
6565
id: avd-cache

.github/workflows/manually.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/setup-java@v4
5454
with:
5555
distribution: 'zulu'
56-
java-version: 23
56+
java-version: 25
5757

5858
- uses: gradle/actions/setup-gradle@v4
5959

test-fixture/app/build.gradle

Lines changed: 0 additions & 36 deletions
This file was deleted.

test-fixture/app/build.gradle.kts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
plugins {
2+
id("com.android.application")
3+
}
4+
5+
android {
6+
namespace = "com.example.testapp"
7+
compileSdk = 36
8+
buildToolsVersion = "36.0.0"
9+
10+
defaultConfig {
11+
applicationId = "com.example.testapp"
12+
minSdk = 23
13+
targetSdk = 36
14+
versionCode = 1
15+
versionName = "1.0"
16+
17+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18+
}
19+
20+
compileOptions {
21+
sourceCompatibility = JavaVersion.VERSION_17
22+
targetCompatibility = JavaVersion.VERSION_17
23+
}
24+
}
25+
26+
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
27+
compilerOptions {
28+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
29+
}
30+
}
31+
32+
dependencies {
33+
implementation("androidx.appcompat:appcompat:1.7.1")
34+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
35+
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
36+
}

test-fixture/build.gradle

Lines changed: 0 additions & 26 deletions
This file was deleted.

test-fixture/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
plugins {
2+
id("com.android.application") version "9.1.0" apply false
3+
id("org.jetbrains.kotlin.android") version "2.3.10" apply false
4+
}
5+

test-fixture/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ org.gradle.caching=true
55
# Kotlin code style
66
kotlin.code.style=official
77

8-
# Enable AndroidX
9-
android.useAndroidX=true
5.38 KB
Binary file not shown.

test-fixture/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

test-fixture/gradlew

Lines changed: 7 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)