From 00a54b48c7c1c5d2e23ddb48ed4ee3bbea3099b2 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Sun, 25 Oct 2020 13:02:43 +0100
Subject: [PATCH] Disable Omnipod plugin for upstream

This reverts commit ba66dc9bf40fd9479bbf9c6449747d6bb78cd19c.
---
 .github/workflows/gradle-ci-workflow.yaml     | 33 -------------------
 app/build.gradle                              |  2 +-
 .../dependencyInjection/PluginsModule.kt      |  7 ----
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 .github/workflows/gradle-ci-workflow.yaml

diff --git a/.github/workflows/gradle-ci-workflow.yaml b/.github/workflows/gradle-ci-workflow.yaml
deleted file mode 100644
index 6ec6107b54..0000000000
--- a/.github/workflows/gradle-ci-workflow.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Gradle CI
-
-on:
-  - push
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Create NDK path
-        run: sudo mkdir -p /usr/local/lib/android/sdk/ndk && sudo chmod 777 /usr/local/lib/android/sdk/ndk
-      - name: Cache NDKs
-        id: cache-ndk
-        uses: actions/cache@v2
-        with:
-          path: /usr/local/lib/android/sdk/ndk
-          key: ${{ runner.os }}-ndk-21.0.6113669-21.1.6352462
-      - name: Install NDK 21.0.6113669
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
-      - name: Install NDK 21.1.6352462
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.1.6352462" --sdk_root=${ANDROID_SDK_ROOT}
-      - uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: assembleFullDebug
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
-          configuration-cache-enabled: true
diff --git a/app/build.gradle b/app/build.gradle
index 6ceb4d1e30..07139638fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,7 +128,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.7-omnipod-0.4.1-SNAPSHOT"
+        version "2.7.0-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index b28073a055..892c9c36a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -42,7 +42,6 @@ import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -156,12 +155,6 @@ abstract class PluginsModule {
     @IntKey(150)
     abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(155)
-    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
-
     @Binds
     @NotNSClient
     @IntoMap