Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 045008fc authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch 'lineage-20.0' into v1-t

parents 59a82000 3b626a47
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
name: build

on: [push, pull_request, workflow_dispatch]

jobs:
  build:
    runs-on: ubuntu-latest

    steps:
    - name: Checkout repo
      uses: actions/checkout@v3

    - name: Build
      uses: ./.github/workflows/build
+30 −0
Original line number Diff line number Diff line
name: build

runs:
    using: composite

    steps:
    - name: Setup JDK 17
      uses: actions/setup-java@v3
      with:
        distribution: 'zulu'
        java-version: 17
        cache: 'gradle'

    - name: Build with Gradle
      shell: bash
      run: ./gradlew assembleDebug

    - name: Generate Android.bp
      shell: bash
      run: |
        ./gradlew app:generateBp
        if [[ ! -z $(git status -s) ]]; then
          git status
          exit -1
        fi

    - uses: actions/upload-artifact@v3
      with:
        name: app-debug.apk
        path: app/build/outputs/apk/debug/app-debug.apk
+30 −0
Original line number Diff line number Diff line
name: gerrit checks

on:
  workflow_dispatch:
    inputs:
      ref:
        type: string
      gerrit-ref:
        type: string
      change:
        type: string

jobs:
  build:
    runs-on: ubuntu-latest
    steps:
    - uses: lineageos-infra/fetch-gerrit-change@main
      with:
        gerrit-ref: ${{ inputs.gerrit-ref }}
        ref: ${{ inputs.ref }}

    - name: Build
      uses: ./.github/workflows/build

    - uses: lineageos-infra/gerrit-vote@main
      if: always()
      with:
        auth: ${{ secrets.GERRIT_VOTE_CREDS }}
        change: ${{ inputs.change }}
        ref: ${{ inputs.ref }}
+7 −7
Original line number Diff line number Diff line
@@ -17,21 +17,21 @@
android_app {
    name: "Recorder",

    resource_dirs: ["res"],
    manifest: "src/main/AndroidManifest.xml",
    resource_dirs: ["src/main/res"],

    srcs: [
        "java/**/*.java",
        "gen/**/*.java"
        "src/main/java/**/*.java",
        "src/main/gen/**/*.java"
    ],

    product_specific: true,

    static_libs: [
        "androidx.annotation_annotation",
        "androidx-constraintlayout_constraintlayout",
        "androidx-constraintlayout_constraintlayout-solver",
        // DO NOT EDIT THIS SECTION MANUALLY
        "androidx.appcompat_appcompat",
        "androidx.recyclerview_recyclerview",
        "com.google.android.material_material",
        "androidx-constraintlayout_constraintlayout",
        "elib",
    ],

app/build.gradle

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line
plugins {
    id 'com.android.application'
}

android {
    compileSdk 33

    defaultConfig {
        applicationId "org.lineageos.recorder"
        minSdk 29
        targetSdk 33
        versionCode 1
        versionName "1.1"
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
    }
}

dependencies {
    implementation 'androidx.appcompat:appcompat:1.5.1'
    implementation 'com.google.android.material:material:1.6.1'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
Loading