Skip to content

Commit

Permalink
Update actions used in GitHub Actions workflows (#990)
Browse files Browse the repository at this point in the history
* Update actions used in GitHub Actions workflows

- Update the runner image to `ubuntu-24.04`. `ubuntu-20.04` is now deprecated: actions/runner-images#11101
- Update `actions/checkout` to v4.
- Update `actions/setup-java` to v4 and set the distribution to `temurin`.

* Remove rxPermissions dependency

* Remove XLog dependency

* Use Python 3.8
  • Loading branch information
MGaetan89 authored Feb 22, 2025
1 parent 6f6a72b commit 6160366
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 29 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,22 @@ jobs:
SKIP_OKBUCK: true
EXTRA_OKBUCK_ARGS: "--quiet --stacktrace"
EXTRA_BUCK_ARGS: "-v 0"
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
matrix:
build_cmd: [build, lint, test]
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Install JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.8'
- name: Run ${{ matrix.build_cmd }}
run: ./tooling/ci/build_cmd.sh ${{ matrix.build_cmd }}
- name: Upload snapshot
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/fossa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ on:
jobs:
build:
name: Run Fossa License Check
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Install JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
distribution: temurin
- name: Run Fossa License Check
env:
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
Expand Down
1 change: 0 additions & 1 deletion README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ okbuck {
'^com/uber/okbuck/example/BuildConfig^',
'^android/support/multidex/',
'^com/facebook/buck/android/support/exopackage/',
'^com/github/promeg/xlog_android/lib/XLogConfig^',
'^com/squareup/leakcanary/LeakCanary^',
]
]
Expand Down
1 change: 0 additions & 1 deletion Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ okbuck {
'^com/uber/okbuck/example/BuildConfig^',
'^android/support/multidex/',
'^com/facebook/buck/android/support/exopackage/',
'^com/github/promeg/xlog_android/lib/XLogConfig^',
'^com/squareup/leakcanary/LeakCanary^',
]
]
Expand Down
5 changes: 1 addition & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ android {
applicationId "com.uber.okbuck.app"
multiDexEnabled true
buildConfigField "boolean", "CAN_JUMP", "true"
buildConfigField "boolean", "XLOG_ENABLED", "true"
buildConfigField "int", "EXOPACKAGE_FLAGS", "0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

// If app doesn"t specify dimensions, use missingDimensionStrategy
// If app doesn't specify dimensions, use missingDimensionStrategy
// https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#resolve_matching_errors
missingDimensionStrategy "tier", "free", "paid"
}
Expand Down Expand Up @@ -60,7 +59,6 @@ dependencies {
implementation(name: "rxscreenshotdetector-1.2.0", ext: "aar")
implementation deps.external.rxjava
implementation deps.external.rxandroid
implementation deps.external.rxPermissions
implementation deps.external.butterKnife

implementation deps.androidx.multidex
Expand All @@ -69,7 +67,6 @@ dependencies {
implementation deps.androidx.recyclerView

implementation deps.external.leakCanary
implementation deps.external.xlogAndroidIdle

implementation project(":libraries:emptylibrary")
implementation project(":libraries:kotlinandroidlibrary")
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/uber/okbuck/example/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import butterknife.ButterKnife;
import butterknife.Unbinder;
import com.github.piasy.rxscreenshotdetector.RxScreenshotDetector;
import com.promegu.xlog.base.XLog;
import com.uber.okbuck.example.common.Calc;
import com.uber.okbuck.example.common.CalcMonitor;
import com.uber.okbuck.example.common.IMyAidlInterface;
Expand All @@ -28,7 +27,6 @@
import io.reactivex.schedulers.Schedulers;
import javax.inject.Inject;

@XLog
public class MainActivity extends AppCompatActivity {
@Inject DummyJavaClass mDummyJavaClass;
@Inject DummyAndroidClass mDummyAndroidClass;
Expand Down
12 changes: 0 additions & 12 deletions app/src/main/java/com/uber/okbuck/example/MyApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,13 @@
import android.app.Application;
import androidx.appcompat.app.AppCompatDelegate;
import com.facebook.buck.android.support.exopackage.DefaultApplicationLike;
import com.github.promeg.xlog_android.lib.XLogConfig;

public class MyApp extends DefaultApplicationLike {

static {
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
}

private final Application mApplication;

public MyApp(Application application) {
mApplication = application;
}

@Override
public void onCreate() {
super.onCreate();
if (BuildConfig.XLOG_ENABLED) {
XLogConfig.config(XLogConfig.newConfigBuilder(mApplication).build());
}
}
}
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ okbuck {
"^com/uber/okbuck/example/BuildConfig^",
"^androidx/multidex/",
"^com/facebook/buck/android/support/exopackage/",
"^com/github/promeg/xlog_android/lib/XLogConfig^",
"^com/squareup/leakcanary/LeakCanary^",
"^com/uber/okbuck/example/common/Calc^",
"^com/uber/okbuck/example/common/BuildConfig^",
Expand Down
2 changes: 0 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ def external = [
sqldelight : "com.squareup.sqldelight:android-driver:${versions.sqldelight}",
rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1",
rxjava : "io.reactivex.rxjava2:rxjava:2.2.21",
rxPermissions : "com.tbruyelle.rxpermissions2:rxpermissions:0.9.5",
sqlite : "com.pushtorefresh.storio3:sqlite:3.0.0",
xlogAndroidIdle : "com.github.promeg:xlog-android-idle:2.1.1",
avroIpc : "org.apache.avro:avro-ipc:${versions.avro}",
avroIpcTests : "org.apache.avro:avro-ipc:${versions.avro}:tests",
saxon : "net.sf.saxon:Saxon-HE:10.3",
Expand Down

0 comments on commit 6160366

Please sign in to comment.