Skip to content

Commit

Permalink
Upgrade project (#24)
Browse files Browse the repository at this point in the history
* Expose grpc dependencies as API.

* Added documentation to the library.

* Replace version management with version catalogs.

* Update kotlin and agp.

* Update to ios 16.4. Apply kotlin 1.9.0 to ios target.

* Added docker tests for javascript.

* Unify ios/jvm + js. Lib.

* More unification.

* JS serialization tests pass.

* JVM serialization tests pass.

* Remove unnecessary js files.

* Update to new kotlin source set setup.

* Made all tests run

* update readme.

* Updated dependencies. Removed unnecessary dependencies.

* Fix js tests.

* Bump to version 0.4.0
  • Loading branch information
TimOrtel authored Feb 25, 2024
1 parent aea13a0 commit 9e3509d
Show file tree
Hide file tree
Showing 120 changed files with 2,553 additions and 3,285 deletions.
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
**/build
**/.gradle
**/.idea
/docker
kotlin-js-store/yarn.lock
.gitignore
jitpack.yml
LICENSE.md
local.properties
readme.md
example
test-outputs
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ build
generated
local.properties
*.podspec
*.lock
*.lock
test-outputs
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM markhobson/maven-chrome:jdk-17

WORKDIR /tests
COPY gradlew gradlew
COPY gradle gradle
RUN ./gradlew --version

COPY . .

ENTRYPOINT ["./gradlew"]
RUN ./gradlew :grpc-mp-test:jsTestClasses
34 changes: 18 additions & 16 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import com.google.protobuf.gradle.*

plugins {
`kotlin-dsl`
kotlin("jvm") version "1.7.20"
kotlin("jvm") version libs.versions.kotlin.get()

id("java")
id("com.google.protobuf") version "0.8.18"
id("com.google.protobuf") version libs.versions.protobufGradlePlugin.get()
}

repositories {
Expand All @@ -14,23 +14,25 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") {
implementation(libs.kotlin.gradle.plugin) {
exclude("org.antlr")
}
implementation("com.android.tools.build:gradle:7.0.4") {
implementation(libs.android.gradle.plugin) {
exclude("org.antlr")
}

implementation("com.google.protobuf:protobuf-kotlin:3.20.1")
implementation("com.google.protobuf:protobuf-java-util:3.20.1")
implementation("io.grpc:grpc-protobuf:1.47.0")
implementation("io.grpc:grpc-stub:1.47.0")
implementation("io.grpc:grpc-kotlin-stub:1.2.1")
implementation(libs.google.protobuf.kotlin)
implementation(libs.google.protobuf.java.util)
implementation(libs.grpc.protobuf)
implementation(libs.grpc.stub)
implementation(libs.grpc.kotlin.stub)

implementation("io.grpc:grpc-netty-shaded:1.48.1")
implementation(libs.grpc.netty.shaded)

implementation("com.google.guava:guava:31.1-jre")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation(libs.google.guava)
implementation(libs.kotlinx.coroutines.core)

implementation(project(":test-server"))
}

sourceSets {
Expand All @@ -45,7 +47,6 @@ sourceSets {
}
}


protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.21.1"
Expand Down Expand Up @@ -78,9 +79,10 @@ protobuf {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "17"
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
9 changes: 9 additions & 0 deletions buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
from(files("../gradle/libs.versions.toml"))
}
}
}

include(":test-server")
Loading

0 comments on commit 9e3509d

Please sign in to comment.