diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index ad4f02b..0a39c9c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -57,11 +57,13 @@ jobs: - name: Gradle build run: | + echo "${{ secrets.RELEASE_KEYSTORE }}" > app/gha.keystore.asc + gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch app/gha.keystore.asc > app/gha.jks chmod +x gradlew - ./gradlew build + ./gradlew assembleYggdrasil - name: Upload artifact uses: actions/upload-artifact@v3 with: name: yggdrasil-android - path: app/release/app-release.apk + path: app/build/outputs/apk/yggdrasil/app-yggdrasil.apk diff --git a/.gitignore b/.gitignore index 52ead0e..2595523 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ local.properties /app/libs/yggdrasil.aar /app/libs/yggdrasil-sources.jar +/app/release/* +/app/release diff --git a/app/build.gradle b/app/build.gradle index 2c79707..213ae2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,11 +17,27 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + signingConfigs { + create("yggdrasil") { + // You need to specify either an absolute path or include the + // keystore file in the same directory as the build.gradle file. + storeFile = file("gha.jks") + storePassword = "g1thub4ct10n34yggdr4s1l4ndr01d" + keyAlias = "yggdrasil-android" + keyPassword = "g1thub4ct10n34yggdr4s1l4ndr01d" + } + } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + yggdrasil { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig = signingConfigs.getByName("yggdrasil") + } } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -42,4 +58,4 @@ dependencies { testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' -} \ No newline at end of file +} diff --git a/app/release/app-release.apk b/app/release/app-release.apk deleted file mode 100644 index 308acc1..0000000 Binary files a/app/release/app-release.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index 03e0490..0000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "eu.neilalexander.yggdrasil", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "versionCode": 1, - "versionName": "1.0", - "outputFile": "app-release.apk" - } - ] -} \ No newline at end of file diff --git a/readme.md b/readme.md index 21dc34b..a4f2ec1 100644 --- a/readme.md +++ b/readme.md @@ -26,7 +26,7 @@ cp /tmp/yggdrasil-go/yggdrasil.aar /tmp/yggdrasil-android/app/libs/ ``` cd /tmp/yggdrasil-android -./gradew assemble +./gradew assembleRelease ``` note: you will need to use jdk-11 as jdk-16 `"doesn't work" ™`