Skip to content

Commit

Permalink
Merge/cherry-pick pull request #55 from rubensousa/code_allocations
Browse files Browse the repository at this point in the history
Optimize code and string allocations
# Conflicts:
#	jsbridge/src/main/kotlin/de/prosiebensat1digital/oasisjsbridge/JsBridge.kt
#	jsbridge/src/main/kotlin/de/prosiebensat1digital/oasisjsbridge/extensions/PromiseExtension.kt
#	jsbridge/src/main/kotlin/de/prosiebensat1digital/oasisjsbridge/extensions/XMLHttpRequestExtension.kt
  • Loading branch information
rubensousa authored and Eridana committed Mar 1, 2024
1 parent a58d365 commit a63a088
Show file tree
Hide file tree
Showing 16 changed files with 1,484 additions and 1,077 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17

- name: Test
run: ./gradlew test

Expand All @@ -37,6 +42,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 17

- name: Run Tests
uses: reactivecircus/android-emulator-runner@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:8.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin.kotlin"
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 25 22:41:45 CEST 2019
#Thu Feb 29 01:56:18 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
7 changes: 7 additions & 0 deletions jsbridge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ group = 'de.prosiebensat1digital'

android {
compileSdkVersion rootProject.ext.versions.compile_sdk
namespace "de.prosiebensat1digital.oasisjsbridge"

defaultConfig {
targetSdkVersion rootProject.ext.versions.target_sdk
Expand Down Expand Up @@ -52,6 +53,10 @@ android {
}
}

buildFeatures {
buildConfig true
}

externalNativeBuild {
cmake {
path "CMakeLists.txt"
Expand Down Expand Up @@ -121,6 +126,8 @@ dependencies {

testImplementation "junit:junit:$versions.junit"
testImplementation 'org.json:json:20180813'
testImplementation "com.google.truth:truth:1.4.1"

androidTestImplementation "junit:junit:$versions.junit"

testImplementation "org.jetbrains.kotlin:kotlin-test:$versions.kotlin.kotlin"
Expand Down
Loading

0 comments on commit a63a088

Please sign in to comment.