Ci jetpack compose #657
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # Enable d8 merger | ||
| build --define=android_dexmerger_tool=d8_dexmerger | ||
|
|
||
| # Flags for the D8 dexer | ||
| build --define=android_incremental_dexing_tool=d8_dexbuilder | ||
| build --define=android_standalone_dexing_tool=d8_compat_dx | ||
| build --nouse_workers_with_dexbuilder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,13 @@ | ||
| load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") | ||
|
|
||
| _COMPOSE_VERSION = "1.1.0-beta03" | ||
|
|
||
| _KOTLIN_COMPILER_VERSION = "1.5.31" | ||
|
|
||
| _KOTLIN_COMPILER_SHA = "661111286f3e5ac06aaf3a9403d869d9a96a176b62b141814be626a47249fe9e" | ||
|
|
||
| # Setup Kotlin | ||
|
|
||
| local_repository( | ||
| name = "release_archive", | ||
| path = "../../src/main/starlark/release_archive", | ||
|
|
@@ -9,138 +19,82 @@ archive_repository( | |
| name = "io_bazel_rules_kotlin", | ||
| ) | ||
|
|
||
| load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "versions") | ||
|
|
||
| kotlin_repositories( | ||
| compiler_release = kotlinc_version( | ||
| release = _KOTLIN_COMPILER_VERSION, | ||
| sha256 = _KOTLIN_COMPILER_SHA, | ||
| ), | ||
| ) | ||
|
|
||
| register_toolchains("//:kotlin_toolchain") | ||
|
|
||
| ## JVM External | ||
|
|
||
| http_archive( | ||
| name = "rules_jvm_external", | ||
| sha256 = versions.RULES_JVM_EXTERNAL_SHA, | ||
| strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG, | ||
| url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG, | ||
| ) | ||
|
|
||
| load("@rules_jvm_external//:defs.bzl", "maven_install") | ||
|
|
||
| maven_install( | ||
| artifacts = [ | ||
| "org.jetbrains.kotlin:kotlin-stdlib:{}".format(_KOTLIN_COMPILER_VERSION), | ||
| "androidx.core:core-ktx:1.6.0", | ||
| "androidx.appcompat:appcompat:1.3.0", | ||
| "androidx.activity:activity-compose:1.3.0", | ||
| "androidx.compose.material:material:{}".format(_COMPOSE_VERSION), | ||
| "androidx.compose.ui:ui:{}".format(_COMPOSE_VERSION), | ||
| "androidx.compose.ui:ui-tooling:{}".format(_COMPOSE_VERSION), | ||
| "androidx.compose.compiler:compiler:{}".format(_COMPOSE_VERSION), | ||
| "androidx.compose.runtime:runtime:{}".format(_COMPOSE_VERSION), | ||
| ], | ||
| override_targets = { | ||
| "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": "@//:kotlinx_coroutines_core_jvm", | ||
| }, | ||
| repositories = [ | ||
| "https://maven.google.com", | ||
| "https://repo1.maven.org/maven2", | ||
| ], | ||
| ) | ||
|
|
||
| # Secondary maven repository used mainly for workarounds | ||
| maven_install( | ||
| name = "maven_secondary", | ||
| artifacts = [ | ||
| # Workaround to add missing 'sun.misc' dependencies to 'kotlinx-coroutines-core-jvm' artifact | ||
| # Check root BUILD file and 'override_targets' arg of a primary 'maven_install' | ||
| "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1", | ||
|
|
||
| ], | ||
| fetch_sources = True, | ||
| repositories = ["https://repo1.maven.org/maven2"], | ||
| ) | ||
|
|
||
| http_archive( | ||
| name = "bazel_skylib", | ||
| sha256 = versions.SKYLIB_SHA, | ||
| urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/%s/bazel-skylib-%s.tar.gz" % ( | ||
| versions.SKYLIB_VERSION, | ||
| versions.SKYLIB_VERSION, | ||
| )], | ||
| ) | ||
|
|
||
| ## Android | ||
|
|
||
| http_archive( | ||
| name = "rules_android", | ||
| sha256 = versions.ANDROID.SHA, | ||
| strip_prefix = "rules_android-%s" % versions.ANDROID.VERSION, | ||
| urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION], | ||
| ) | ||
|
|
||
| load("@rules_android//android:rules.bzl", "android_sdk_repository") | ||
|
|
||
| android_sdk_repository( | ||
| name = "androidsdk", | ||
| build_tools_version = versions.ANDROID.BUILD_TOOLS, # versions > 30.0.3 do not have the dx.jar anymore. | ||
|
There was a problem hiding this comment. Might wanna link to bazelbuild/bazel#13989 for some context |
||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="cm.ben.android.bazel.compose.example"> | ||
|
There was a problem hiding this comment. Shall we change the package name to something closer to the Kotlin rules' package? |
||
|
|
||
| <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" /> | ||
| </manifest> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,28 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| package="cm.ben.android.bazel.compose.example.ui"> | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="24" | ||
| android:targetSdkVersion="29" /> | ||
|
|
||
| <application | ||
| android:label="Bazel Jetpack Compose Example" | ||
| android:theme="@style/Theme.AppCompat.Light.NoActionBar"> | ||
| <activity | ||
| android:name=".MainActivity" | ||
| android:label="Bazel Jetpack Compose Example"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
|
|
||
| <!-- Resolve a conflict issue while building with Bazel. --> | ||
| <provider | ||
| android:name="androidx.startup.InitializationProvider" | ||
| android:authorities="${applicationId}.androidx-startup" | ||
| tools:node="remove" /> | ||
| </application> | ||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,21 @@ | ||
| package cm.ben.android.bazel.compose.example.ui | ||
|
|
||
| import android.os.Bundle | ||
| import androidx.activity.compose.setContent | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
|
|
||
| class MainActivity : AppCompatActivity() { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContent { | ||
| Greeting("world") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
|
There was a problem hiding this comment. Does this actually work with Android Studio and Bazel? I never got the previews to work. There was a problem hiding this comment. There was a problem hiding this comment. sigh We've got some work to do before we have a complete working system. |
||
| @Composable | ||
| fun Greeting(name: String) = Text(text = "Hello $name!") | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| load("@rules_java//java:defs.bzl", "java_library") | ||
|
|
||
| java_library( | ||
| name = "sun_misc", | ||
| srcs = [ | ||
| "sun/misc/Signal.java", | ||
| "sun/misc/SignalHandler.java", | ||
| ], | ||
| neverlink = True, | ||
| visibility = ["//visibility:public"], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package sun.misc; | ||
|
|
||
| public final class Signal { | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package sun.misc; | ||
|
|
||
| public interface SignalHandler { | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't have a strong opinion on this, but should we maybe target the last stable instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's complicated because they are tied to the Kotlin compiler. I made note of that in the description. We can pass the compiler plugin flags to ignore these Kotlin/Compose version checks, but that might bring some instability.