Skip to content
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
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
local.properties

# intellij configs
.idea/workspace.xml
.idea/libraries
.idea/caches

.DS_Store
/build
/captures
.externalNativeBuild

# local dev env vars
.envrc
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 16 additions & 13 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions README.macos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Getting started on MacOS

## Setup
- Download Intellij IDEA CE: https://www.jetbrains.com/idea/download/
- Install oracle JDK 8: https://www.oracle.com/java/technologies/javase-jdk8-downloads.html
- Install the android SDK via homebrew: https://formulae.brew.sh/cask/android-sdk

## Repo clone and setup
- Clone the git repo
- Export `JAVA_HOME` and `ANDROID_HOME` variables similar to these:
```sh
ANDROID_HOME=/usr/local/share/android-sdk
JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_241.jdk/Contents/Home
```

- Open the project in IntelliJ
- Follow Intellij's prompts to point it to your preinstalled JDK8 and Android SDK using the same paths as your earlier environment variables.
- Click Build -> Build Project.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
compile 'com.android.support:design:26.0.0-alpha1'
compile files('C:/Users/Yo7A/Desktop/HealthWatcher/lib/commons-math3-3.6.1.jar')
compile 'com.android.support:design:25.4.0'
compile files('lib/commons-math3-3.6.1.jar')
}
File renamed without changes.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'com.android.tools.build:gradle:3.6.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -14,6 +15,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Mar 13 19:36:18 EET 2017
#Tue Mar 24 11:28:00 CDT 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
109 changes: 66 additions & 43 deletions gradlew
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading