Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LMN-15654 | Fix heath fit connection data fetch #20

Merged
merged 4 commits into from
Mar 5, 2024
Merged

LMN-15654 | Fix heath fit connection data fetch #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddd670e
Revert "LMN-14303 | Client v2 - Run integrations queries in a small c…
rtokun Mar 4, 2024
92c62f6
Revert "LMN-13903 | Implement Google Health Connect into our V2 Plugin"
rtokun Mar 4, 2024
f3d0e04
Done
rtokun Mar 5, 2024
6b12db0
Fix bug
rtokun Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions packages/health/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,36 @@ group 'cachet.plugins.health'
version '1.2'

buildscript {
ext.kotlin_version = '1.8.0'
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

rootProject.allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 34
compileSdkVersion 33

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 26
targetSdkVersion 33
minSdkVersion 16
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
lintOptions {
Expand All @@ -41,15 +40,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2022.10.00')
implementation(composeBom)
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation("com.google.android.gms:play-services-fitness:21.0.1")
implementation("com.google.android.gms:play-services-auth:20.2.0")

// The new health connect api
implementation("androidx.health.connect:connect-client:1.1.0-alpha06")

def fragment_version = "1.6.2"
implementation "androidx.fragment:fragment-ktx:$fragment_version"
}
2 changes: 1 addition & 1 deletion packages/health/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
39 changes: 0 additions & 39 deletions packages/health/android/src/main/kotlin/cachet/plugins/health/Constants.kt
View file
Open in desktop

This file was deleted.

957 changes: 0 additions & 957 deletions packages/health/android/src/main/kotlin/cachet/plugins/health/HealthConnectService.kt
View file
Open in desktop

This file was deleted.

Loading
Loading