Merge pull request #154 from stefan2904/dependency_org-java-1-3-1

Change org-java to revived fork, bump to 1.3.1

.github/workflows/android-build-master.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - 'master'
 
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
 jobs:
   build:
     name: Generate APK
@@ -24,6 +27,8 @@ jobs:
 
       - name: Build APK
         run: ./gradlew assembleDebug
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload APK
         uses: actions/upload-artifact@v2

.github/workflows/prerelease.yml

@@ -35,6 +35,8 @@ jobs:
       # Build the standard version binary.
       - name: Generate "premium" release APK
         run: ./gradlew assemblePremiumRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -56,6 +58,8 @@ jobs:
       # Now do the same for the F-Droid flavor.
       - name: Generate "fdroid" release APK
         run: ./gradlew assembleFdroidRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1

.github/workflows/release.yml

@@ -36,6 +36,8 @@ jobs:
       # Build the standard version binary.
       - name: Generate "premium" release APK
         run: ./gradlew assemblePremiumRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1
@@ -57,6 +59,8 @@ jobs:
       # Now do the same for the F-Droid flavor.
       - name: Generate "fdroid" release APK
         run: ./gradlew assembleFdroidRelease --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Sign APK using key store from repo secrets
         uses: r0adkll/sign-android-release@v1

app/build.gradle

@@ -216,7 +216,7 @@ def orgJavaLocation() {
         logger.info("app: Using org-java from ${gradle.ext.orgJavaDir}")
         return project(':org-java')
     } else {
-        logger.info("app: Using com.orgzly:org-java:$versions.org_java from Maven repository")
-        return "com.orgzly:org-java:$versions.org_java"
+        logger.info("app: Using com.orgzlyrevived:org-java:$versions.org_java from Maven repository")
+        return "com.orgzlyrevived:org-java:$versions.org_java"
     }
 }

build.gradle

@@ -45,7 +45,7 @@ buildscript {
 
     versions.android_test_uiautomator = '2.2.0'
 
-    versions.org_java = '1.3-SNAPSHOT'
+    versions.org_java = '1.3.1'
 
     versions.loremipsum = '1.0'
 
@@ -98,6 +98,16 @@ allprojects {
         maven {
             url 'https://jitpack.io'
         }
+
+        // For  com.orgzlyrevived.org-java
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/orgzly-revived/org-java")
+            credentials {
+                username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
+                password = project.findProperty("gpr.key")  ?: System.getenv("GITHUB_TOKEN")
+            }
+        }
     }
 
     tasks.withType(JavaCompile) {

sample.app.properties

@@ -15,6 +15,13 @@ dropbox.app_key = "appkey"
 # Same as above, but prefixed with "db-"
 dropbox.app_key_schema = "db-appkey"
 
+
+# Github Package Registry access credentials.
+# see https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry
+# used to pull the com.orgzlyrevived.org-java dependency from https://github.com/orgzly-revived/org-java
+gpr.user = ""
+gpr.key  = ""
+
 # Use org-java from local directory instead of the Maven repository.
 # If you are working on org-java project, this can make development process easier.
 # Don't forget to sync project with Gradle files (in Android Studio) if you change this value.