Skip to content

Commit

Permalink
chore: update gradle wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
ttypic committed Sep 25, 2024
1 parent 161fc45 commit 6587322
Show file tree
Hide file tree
Showing 24 changed files with 337 additions and 584 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ charset = utf-8
indent_style = space
indent_size = 2

[*.{java,groovy,gradle}]
[*.{java,groovy,gradle,kts}]
indent_size = 4

[*.md]
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: ./gradlew checkstyleMain checkstyleTest checkWithCodenarc runUnitTests
- name: Set up the JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- run: ./gradlew checkWithCodenarc checkstyleMain checkstyleTest runUnitTests
6 changes: 6 additions & 0 deletions .github/workflows/emulate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- name: Set up the JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: Enable KVM
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ jobs:
with:
submodules: 'recursive'

- name: Set up the JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- run: ./gradlew :java:testRestSuite

- uses: actions/upload-artifact@v3
Expand All @@ -30,6 +36,12 @@ jobs:
with:
submodules: 'recursive'

- name: Set up the JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- run: ./gradlew :java:testRealtimeSuite

- uses: actions/upload-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
- name: Set up the JDK
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'

- name: Build docs
run: ./gradlew javadoc
Expand Down
105 changes: 0 additions & 105 deletions android/build.gradle

This file was deleted.

65 changes: 65 additions & 0 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
plugins {
alias(libs.plugins.android.library)
}

android {
namespace = "io.ably.lib"
defaultConfig {
minSdk = 19
compileSdk = 30
buildConfigField("String", "LIBRARY_NAME", "\"android\"")
buildConfigField("String", "VERSION", "\"${property("VERSION_NAME")}\"")
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments["class"] = "io.ably.lib.test.android.AndroidPushTest"
testInstrumentationRunnerArguments["timeout_msec"] = "300000"
consumerProguardFiles("proguard.txt")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
}
}

buildFeatures {
buildConfig = true
}

lint {
abortOnError = false
}

testOptions.targetSdk = 30

sourceSets {
getByName("main") {
java.srcDirs("src/main/java", "../lib/src/main/java")
}
getByName("androidTest") {
java.srcDirs("src/androidTest/java", "../lib/src/test/java")
assets.srcDirs("../lib/src/test/resources")
}
}
}

dependencies {
api(libs.gson)
implementation(libs.bundles.common)
testImplementation(libs.bundles.tests)
implementation(libs.firebase.messaging)
androidTestImplementation(libs.bundles.instrumental.android)
}

configurations {
all {
exclude(group = "org.hamcrest", module = "hamcrest-core")
}
getByName("androidTestImplementation") {
extendsFrom(configurations.getByName("testImplementation"))
}
}
149 changes: 0 additions & 149 deletions android/maven.gradle

This file was deleted.

Loading

0 comments on commit 6587322

Please sign in to comment.