diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a37d1d9..6cf899e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -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 diff --git a/README.md b/README.md index 1f8e49e..d71879e 100644 --- a/README.md +++ b/README.md @@ -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*. * @@ -90,4 +91,3 @@ Usually you can combine **MODIFIES** and **EFFECTS** into one sentence and if yo */ fun add(member: T): Int { ... } -``` diff --git a/tutorial/androidApp/build.gradle.kts b/tutorial/androidApp/build.gradle.kts index b5ea2b7..a4983b1 100644 --- a/tutorial/androidApp/build.gradle.kts +++ b/tutorial/androidApp/build.gradle.kts @@ -67,6 +67,9 @@ android { isMinifyEnabled = false } } + lintOptions { + isAbortOnError = false + } kotlinOptions { jvmTarget = "1.8" } diff --git a/tutorial/androidApp/src/main/java/com/example/tutorial/androidApp/ui/onboarding/PlayInteractiveGamesFragment.java b/tutorial/androidApp/src/main/java/com/example/tutorial/androidApp/ui/onboarding/PlayInteractiveGamesFragment.java deleted file mode 100644 index fbbe0f2..0000000 --- a/tutorial/androidApp/src/main/java/com/example/tutorial/androidApp/ui/onboarding/PlayInteractiveGamesFragment.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.tutorial.androidApp.ui.onboarding; - -import android.app.Activity; - -public class PlayInteractiveGamesFragment extends Activity { -} diff --git a/tutorial/gradle.properties b/tutorial/gradle.properties index 634e8f7..e75902f 100644 --- a/tutorial/gradle.properties +++ b/tutorial/gradle.properties @@ -4,3 +4,4 @@ android.useAndroidX=true kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false android.enableJetifier=true +jvmArgs=-Xmx1g \ No newline at end of file