Skip to content

Commit

Permalink
Merge pull request #29 from rogergcc/dev
Browse files Browse the repository at this point in the history
Dev + ci yaml correct?
  • Loading branch information
rogergcc authored Sep 8, 2024
2 parents d56c085 + c833733 commit f250094
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/AndroidBuild.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: AndroidBuild
on:
pull_request:
branches: [main]
branches: [ main ]
push:
branches: [main]
branches: [ main ]

jobs:
build:
Expand All @@ -15,8 +15,11 @@ jobs:
- name: Setup Java JDK
uses: actions/[email protected]
with:
java-version: 8
distribution: "temurin"
java-version: 17
distribution: "adopt"

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build
Expand Down
7 changes: 6 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ plugins {
}

def localProperties = new Properties()
localProperties.load(new FileInputStream(rootProject.file("local.properties")))
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(reader)
}
}

android {
namespace 'com.rogergcc.filmsthemoviedbapp'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="com.rogergcc.filmsthemoviedbapp">

<uses-permission android:name="android.permission.INTERNET" />

<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application
android:name=".presentation.BaseApplication"
android:allowBackup="true"
Expand Down

0 comments on commit f250094

Please sign in to comment.