Skip to content
This repository has been archived by the owner on May 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #19 from UBC-BEST/add-wireframes
Browse files Browse the repository at this point in the history
fix cicd #20
  • Loading branch information
lhao03 authored Feb 20, 2021
2 parents 94956ff + f0ef992 commit c2fe2d9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 20 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:
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: Change wrapper permissions - tutorial
run: |
cd tutorial
chmod +x ./gradlew
- name: Build with Gradle - tutorial
run: |
cd tutorial
./gradlew build
- uses: actions/checkout@v2
- name: set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Change wrapper permissions - tutorial
run: |
cd tutorial
chmod +x ./gradlew
- name: Build with Gradle - tutorial
run: |
cd tutorial
./gradlew assembleRelease --no-daemon
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ When the user interacts with the user interface, the controller either directs t
- for each class, make a new file
- at the top of the file, make a comment about what the class represents. An example looks like
```
/**
* A group of *members*.
*
Expand All @@ -90,4 +91,3 @@ Usually you can combine **MODIFIES** and **EFFECTS** into one sentence and if yo
*/
fun add(member: T): Int { ... }
```
3 changes: 3 additions & 0 deletions tutorial/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ android {
isMinifyEnabled = false
}
}
lintOptions {
isAbortOnError = false
}
kotlinOptions {
jvmTarget = "1.8"
}
Expand Down

This file was deleted.

1 change: 1 addition & 0 deletions tutorial/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ android.useAndroidX=true
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
android.enableJetifier=true
jvmArgs=-Xmx1g

0 comments on commit c2fe2d9

Please sign in to comment.