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.

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

Removed some plugin & Dependencies that is outdated #129

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 21 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,38 @@ dependencies {
implementation "org.radarbase:radar-android-phone:$radarCommonsVersion"
implementation "org.radarbase:radar-android-phone-usage:$radarCommonsVersion"
selfReleaseImplementation "org.radarbase:radar-android-phone-telephony:$radarCommonsVersion"
implementation "org.radarbase:radar-android-empatica:$radarCommonsVersion"
// implementation "org.radarbase:radar-android-empatica:$radarCommonsVersion"
implementation "org.radarbase:radar-android-application-status:$radarCommonsVersion"
implementation "org.radarbase:radar-android-weather:$radarCommonsVersion"
implementation "org.radarbase:radar-android-audio:$radarCommonsVersion"
implementation "org.radarbase:radar-android-faros:$radarCommonsVersion"
implementation "org.radarbase:radar-android-ppg:$radarCommonsVersion"
//implementation "org.radarbase:radar-android-ppg:$radarCommonsVersion"

implementation 'androidx.lifecycle:lifecycle-process:2.5.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

testImplementation 'junit:junit:4.13.2'
testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.3'

// Import the Firebase BoM
implementation platform('com.google.firebase:firebase-bom:31.2.2')

// When using the BoM, you don't specify versions in Firebase library dependencies

// Add the dependency for the Firebase SDK for Google Analytics
implementation 'com.google.firebase:firebase-analytics-ktx'

// TODO: Add the dependencies for any other Firebase products you want to use
// See https://firebase.google.com/docs/android/setup#available-libraries
// For example, add the dependencies for Firebase Authentication and Cloud Firestore
implementation 'com.google.firebase:firebase-auth-ktx'
implementation 'com.google.firebase:firebase-firestore-ktx'
implementation 'com.google.firebase:firebase-core:21.1.1'



}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ import org.radarbase.android.source.SourceProvider
import org.radarbase.monitor.application.ApplicationStatusProvider
import org.radarbase.passive.audio.OpenSmileAudioProvider
import org.radarbase.passive.bittium.FarosProvider
import org.radarbase.passive.empatica.E4Provider
//import org.radarbase.passive.empatica.E4Provider
import org.radarbase.passive.phone.PhoneBluetoothProvider
import org.radarbase.passive.phone.PhoneContactListProvider
import org.radarbase.passive.phone.PhoneLocationProvider
import org.radarbase.passive.phone.PhoneSensorProvider
import org.radarbase.passive.phone.usage.PhoneUsageProvider
import org.radarbase.passive.ppg.PhonePpgProvider
//import org.radarbase.passive.ppg.PhonePpgProvider
import org.radarbase.passive.weather.WeatherApiProvider

class RadarServiceImpl : RadarService() {
override val plugins: List<SourceProvider<*>> = listOf(
ApplicationStatusProvider(this),
OpenSmileAudioProvider(this),
E4Provider(this),
// E4Provider(this),
FarosProvider(this),
PhoneBluetoothProvider(this),
PhoneContactListProvider(this),
PhoneLocationProvider(this),
PhoneSensorProvider(this),
PhoneUsageProvider(this),
PhonePpgProvider(this),
// PhonePpgProvider(this),
WeatherApiProvider(this),
)

Expand Down
2 changes: 1 addition & 1 deletion app/src/release/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
google-services.json
../debug/google-services.json
24 changes: 19 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,36 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:4.3.14'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
classpath 'com.google.gms:google-services:4.3.15'

}
}


plugins {
id("com.github.ben-manes.versions") version "0.42.0"
// Add the Google services Gradle plugin
// id 'com.google.gms.google-services'
}

allprojects {
repositories {
// Make sure that you have the following two repositories
google() // Google's Maven repository
mavenCentral() // Maven Central repository
maven { url 'https://maven.google.com' }
}
}

def isNonStable = { String version ->
def isNonStable = { version ->
def stableKeyword = ["RELEASE", "FINAL", "GA"].any { version.toUpperCase().contains(it) }
def regex = /^[0-9,.v-]+(-r)?$/
return !stableKeyword && !(version ==~ regex)
Expand Down