Skip to content

Commit c7db6a3

Browse files
Merge pull request #30 from amanshuraikwar/update-theme-data-tests
Update theme data tests
2 parents 1efc60c + c77d851 commit c7db6a3

14 files changed

Lines changed: 215 additions & 105 deletions

File tree

.github/workflows/main.yml renamed to .github/workflows/build-web-html-js-deploy-github-pages.yml

File renamed without changes.

.github/workflows/theme-data-tests.yml renamed to .github/workflows/theme-data-tests-shared-android-jvm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Theme Data Tests
1+
name: Theme Data Tests :shared Android/JVM
22

33
on:
44
workflow_dispatch:

README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
       
77
![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/build-web-html-js.yml/badge.svg)
88
       
9-
![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/theme-data-tests.yml/badge.svg)
10-
</p>
11-
12-
13-
9+
<a href="https://amanshuraikwar.github.io/theme-data-tests-shared-android-jvm/">![](https://github.com/amanshuraikwar/amanshuraikwar.github.io/actions/workflows/theme-data-tests-shared-android-jvm.yml/badge.svg)</a>
1410

11+
</p>
1512

1613
This is my portfolio. It is a KMM project which runs on Web, Android, iOS.
1714

project-files/Portfolio/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
9-
classpath("com.android.tools.build:gradle:7.1.0-beta05")
9+
classpath("com.android.tools.build:gradle:7.2.0-alpha06")
1010
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.31")
1111
}
1212
}

project-files/Portfolio/buildSrc/src/main/java/io/github/amanshuraikwar/nxtbuz/buildSrc/dependencies.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ object Libs {
66
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
77
const val threeTenAbp = "com.jakewharton.threetenabp:threetenabp:1.2.4"
88

9-
const val multiplatformSettings = "com.russhwolf:multiplatform-settings:0.7.7"
10-
const val multiplatformSettingsNoArg = "com.russhwolf:multiplatform-settings-no-arg:0.7.7"
9+
const val multiplatformSettings = "com.russhwolf:multiplatform-settings:0.8.1"
10+
const val multiplatformSettingsNoArg = "com.russhwolf:multiplatform-settings-no-arg:0.8.1"
11+
const val multiplatformSettingsTest = "com.russhwolf:multiplatform-settings-test:0.8.1"
1112

1213
const val coilCompose = "io.coil-kt:coil-compose:1.3.1"
1314

project-files/Portfolio/buildWebsite.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ File(".") exec "cp -R build/home/ build/"
5151
println("Deleting build/home...")
5252
File(".") exec "rm -rf build/home"
5353

54+
println("Running theme data tests in :shared for Android/JVM target...")
55+
File(".") exec "./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest"
56+
println("Creating directory build/theme-data-tests-shared-android-jvm...")
57+
File(".") exec "mkdir build/theme-data-tests-shared-android-jvm"
58+
println("Copying contents from shared/build/reports/tests/testDebugUnitTest/ to build/theme-data-tests-shared-android-jvm/...")
59+
File(".") exec "cp -R shared/build/reports/tests/testDebugUnitTest/ build/theme-data-tests-shared-android-jvm/"
60+
5461
data class BlogListEntry(
5562
val title: String,
5663
val date: String,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat Jul 10 16:36:22 SGT 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

project-files/Portfolio/shared/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ kotlin {
5858
dependencies {
5959
implementation(kotlin("test"))
6060
implementation(Libs.Ktor.clientMock)
61+
implementation(Libs.multiplatformSettingsTest)
6162
}
6263
}
6364
val androidMain by getting {

project-files/Portfolio/shared/src/androidMain/kotlin/io/github/amanshuraikwar/portfolio/Platform.kt

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

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/Platform.kt

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

0 commit comments

Comments
 (0)