Add AS 4.1 support (#932)

spekframework · Nov 5, 2020 · 88d54d2 · 88d54d2
1 parent 29d63f7
commit 88d54d2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/check-pr-as-plugin.yaml b/.github/workflows/check-pr-as-plugin.yaml
@@ -15,7 +15,7 @@ jobs:
   build:
     strategy:
       matrix:
-        as_sdk: [AS36, AS40]
+        as_sdk: [AS36, AS40, AS41]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -64,7 +64,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        as_sdk: [AS36, AS40]
+        as_sdk: [AS36, AS40, AS41]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/samples/android/gradle.properties b/samples/android/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-spek_version=2.1.0-alpha.0.18+7d751e8
+spek_version=2.0.14-alpha.0.3+29d63f7
 android_junit5_version=1.5.2.0
 junit5_runner=0.2.2
 jacoco_version=0.8.1

diff --git a/samples/android/gradle/wrapper/gradle-wrapper.properties b/samples/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 02 15:29:30 AEDT 2020
+#Thu Nov 05 20:21:39 AEDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/spek-ide-plugin-android-studio/build.gradle.kts b/spek-ide-plugin-android-studio/build.gradle.kts
@@ -19,10 +19,17 @@ val buildMatrix = mapOf(
         "AS34",
         ij.VersionRange("193.6911.18", "193.6911.18.*"),
         arrayOf("android", "java", "org.jetbrains.kotlin:1.3.70-release-Studio4.0-1")
+    ),
+    "AS41" to ij.BuildConfig(
+        "201.7223.91",
+        "Studio4.0",
+        "AS34",
+        ij.VersionRange("201.8743.12", "201.8743.12.*"),
+        arrayOf("android", "java", "org.jetbrains.kotlin:1.3.72-release-Studio4.1-5")
     )
 )
 
-val sdkVersion = project.properties["as.version"] ?: "AS40"
+val sdkVersion = project.properties["as.version"] ?: "AS41"
 val settings = checkNotNull(buildMatrix[sdkVersion])
 
 intellij {