Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesward committed Jul 8, 2022
1 parent 39d0a74 commit 370cf57
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 40 deletions.
29 changes: 12 additions & 17 deletions examples/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ plugins {
kotlin("android")
}

val composeVersion = "1.1.0"
val composeVersion = "1.1.1"
val composeCompilerVersion = "1.2.0"

dependencies {
implementation(project(":stub-android"))
implementation(kotlin("stdlib"))
implementation("androidx.activity:activity-compose:1.4.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation(kotlin("stdlib-jdk8"))
implementation("androidx.activity:activity-compose:1.5.0")
implementation("androidx.appcompat:appcompat:1.4.2")

implementation("androidx.compose.foundation:foundation-layout:$composeVersion")
implementation("androidx.compose.material:material:$composeVersion")
Expand All @@ -21,6 +22,12 @@ dependencies {
runtimeOnly("io.grpc:grpc-okhttp:${rootProject.ext["grpcVersion"]}")
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}

android {
compileSdk = 31
buildToolsVersion = "31.0.0"
Expand All @@ -40,8 +47,6 @@ android {
}
}

sourceSets["main"].java.srcDir("src/main/kotlin")

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand All @@ -52,16 +57,6 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = composeVersion
}

packagingOptions {
resources.excludes += "META-INF/kotlinx_coroutines_core.version"
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
kotlinCompilerExtensionVersion = composeCompilerVersion
}
}
8 changes: 4 additions & 4 deletions examples/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
plugins {
id("com.android.application") version "7.0.4" apply false
id("com.android.application") version "7.0.4" apply false // Older for IntelliJ Support
id("com.google.protobuf") version "0.8.18" apply false
kotlin("jvm") version "1.6.10" apply false // Compose Compiler required version
kotlin("jvm") version "1.7.0" apply false
id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
}

// todo: move to subprojects, but how?
ext["grpcVersion"] = "1.46.0"
ext["grpcVersion"] = "1.47.0"
ext["grpcKotlinVersion"] = "1.3.0" // CURRENT_GRPC_KOTLIN_VERSION
ext["protobufVersion"] = "3.20.1"
ext["protobufVersion"] = "3.21.2"
ext["coroutinesVersion"] = "1.6.2"

allprojects {
Expand Down
5 changes: 3 additions & 2 deletions examples/client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ plugins {
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

dependencies {
Expand Down
Binary file modified examples/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion examples/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions examples/native-client/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
plugins {
application
kotlin("jvm")
id("com.palantir.graal") version "0.10.0"
id("com.palantir.graal") version "0.12.0"
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}

dependencies {
Expand All @@ -20,10 +21,10 @@ application {

// todo: add graalvm-config-create task
// ./gradlew :native-client:install
// JAVA_HOME=~/.gradle/caches/com.palantir.graal/22.0.0.2/11/graalvm-ce-java11-22.0.0.2 JAVA_OPTS=-agentlib:native-image-agent=config-output-dir=native-client/src/graal native-client/build/install/native-client/bin/native-client
// JAVA_HOME=~/.gradle/caches/com.palantir.graal/22.1.0/11/graalvm-ce-java11-22.1.0 JAVA_OPTS=-agentlib:native-image-agent=config-output-dir=native-client/src/graal native-client/build/install/native-client/bin/native-client

graal {
graalVersion("22.0.0.2")
graalVersion("22.1.0")
javaVersion("11")
mainClass(application.mainClass.get())
outputName("hello-world")
Expand Down
5 changes: 3 additions & 2 deletions examples/server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ plugins {
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/stub-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
dependencies {
protobuf(project(":protos"))

api(kotlin("stdlib"))
api(kotlin("stdlib-jdk8"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:${rootProject.ext["coroutinesVersion"]}")

api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
Expand All @@ -35,7 +35,7 @@ android {
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
}

Expand Down
7 changes: 4 additions & 3 deletions examples/stub-lite/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
}

Expand Down
9 changes: 5 additions & 4 deletions examples/stub/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
dependencies {
protobuf(project(":protos"))

api(kotlin("stdlib"))
api(kotlin("stdlib-jdk8"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext["coroutinesVersion"]}")

api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
Expand All @@ -35,13 +35,14 @@ sourceSets {
*/

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
kotlinOptions {
freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
freeCompilerArgs = listOf("-opt-in=kotlin.RequiresOptIn")
}
}

Expand Down

0 comments on commit 370cf57

Please sign in to comment.