Skip to content

Commit

Permalink
Removed intellij plugin as Appyx is our preferred option
Browse files Browse the repository at this point in the history
  • Loading branch information
LachlanMcKee committed Sep 23, 2024
1 parent 35e137c commit fd4a71d
Show file tree
Hide file tree
Showing 51 changed files with 76 additions and 2,182 deletions.
145 changes: 76 additions & 69 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ jobs:
name: Assemble
runs-on: ubuntu-latest
timeout-minutes: 25
env:
JAVA_TOOL_OPTIONS: -Xmx6g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: actions/setup-java@v4
with:
java-version: 11
- uses: actions/cache@v2
distribution: 'zulu'
java-version: '11'
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -38,34 +36,33 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'zulu'
java-version: '11'
- name: Detekt
run: ./gradlew detekt --stacktrace
working-directory: .
- name: Upload failure reports
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: '**/build/reports'

unit-tests:
name: Unit tests
runs-on: ubuntu-latest
timeout-minutes: 20
env:
JAVA_TOOL_OPTIONS: -Xmx4g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: actions/setup-java@v4
with:
java-version: 11
- uses: actions/cache@v2
distribution: 'zulu'
java-version: '11'
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -78,7 +75,7 @@ jobs:
working-directory: .
- name: Upload failure reports
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: unit-test-reports
path: '**/build/reports'
Expand All @@ -88,60 +85,70 @@ jobs:
rm -f ~/.gradle/caches/modules-2/gc.properties
instrumentation-tests:
runs-on: macOS-latest
timeout-minutes: 60
env:
JAVA_TOOL_OPTIONS: -Xmx4g
GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
strategy:
fail-fast: false
matrix:
api-level: [22,25,29]
name: Instrumentation tests [API=${{ matrix.api-level }}]
name: Instrumentation tests
runs-on: macos-13
timeout-minutes: 30
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v1
with:
java-version: 11
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.api-level }}
arch: x86
script: ./gradlew connectedCheck

- name: Upload failure reports
if: failure()
uses: actions/upload-artifact@v2
with:
name: instrumentation-reports-api-${{ matrix.api-level }}
path: '**/build/reports'

- name: Cleanup Gradle Cache
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
- uses: gradle/wrapper-validation-action@v1
- uses: gradle/gradle-build-action@v2
- name: Pre build sources before launching emulator
run: ./gradlew compileDebugAndroidTestSources
- name: AVD cache
uses: actions/cache@v4
id: avd-cache
with:
path: |
~/.android/avd/*
~/.android/adb*
key: avd-29
- name: Create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@v2
with:
# Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
api-level: 29
arch: x86_64
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
script: echo "Generated AVD snapshot for caching."
- name: Instrumentation tests
uses: reactivecircus/android-emulator-runner@v2
with:
# Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
api-level: 29
arch: x86_64
force-avd-creation: false
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: true
script: |
adb logcat > logcat.out &
./gradlew connectedCheck
- name: Upload failed instrumentation artifacts
if: failure()
uses: actions/upload-artifact@v4
with:
name: instrumentation-failures
path: |
**/build/reports
logcat.out
verify-publication:
name: Verify publication
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: actions/setup-java@v4
with:
java-version: 11
- uses: actions/cache@v2
distribution: 'zulu'
java-version: '11'
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
1 change: 0 additions & 1 deletion documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
- Demo apps
- [Tooling](extras/tooling.md)
- [Minimal reactive API](extras/minimal-reactive-api.md)
- Template plugin

## Experimental features

Expand Down
9 changes: 0 additions & 9 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ def kotlinVersion = '1.8.10'

def versions = [
dagger : '2.45',
intellij : '212.5457.46',
intellij_kotlin : '212-1.6.21-release-334-AS5457.46',
kotlin : kotlinVersion,
mviCore : '1.4.0',
robolectric : '4.8.1',
Expand Down Expand Up @@ -64,8 +62,6 @@ def build = [
targetSdk : 32,
guava : "com.google.guava:guava:20.0",
commonsLang : "commons-lang:commons-lang:2.6",
intellijPlugin : "org.jetbrains.intellij:org.jetbrains.intellij.gradle.plugin:1.1.4",
kotlinIdeaPlugin: "org.jetbrains.kotlin:${versions.intellij_kotlin}",
gradlePlugins : [
android : agp,
kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
Expand Down Expand Up @@ -106,7 +102,6 @@ def test = [
mockito : "org.mockito:mockito-core:2.24.0",
mockitoKotlin : "org.mockito.kotlin:mockito-kotlin:3.2.0",
assertj : "org.assertj:assertj-core:2.9.1", // 2.x version is Android compatible
compileTesting: "com.google.testing.compile:compile-testing:0.11",
]

def androidTest = [
Expand All @@ -127,10 +122,6 @@ def external = [
rxrelay2 : "com.jakewharton.rxrelay2:rxrelay:2.1.0",
rxandroid2 : "io.reactivex.rxjava2:rxandroid:2.1.1",
roboelectricBase : "org.robolectric:robolectric:${versions.robolectric}",
rxbinding : 'com.jakewharton.rxbinding2:rxbinding:2.2.0',
leakcanaryDebug : 'com.squareup.leakcanary:leakcanary-android:1.6.3',
apacheCommons : 'org.apache.commons:commons-lang3:3.0',
gson : 'com.google.code.gson:gson:2.8.5',
coil : "io.coil-kt:coil:${versions.coil}",
leakCanary : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}",
appyxCustomisations: "com.bumble.appyx:customisations:${versions.appyx}",
Expand Down
50 changes: 0 additions & 50 deletions plugins/build.gradle

This file was deleted.

Empty file removed plugins/settings.gradle
Empty file.

This file was deleted.

Loading

0 comments on commit fd4a71d

Please sign in to comment.