Skip to content

Upgrade layoutlib to 16.1.0-jdk17 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnsonlee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade layoutlib to 16.1.0-jdk17 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[versions]
aapt2 = "8.1.1-10154469"
android-tools = "31.1.2"
android-tools = "31.7.0"
androidx-lifecycle = "2.6.2"
jackson = "2.13.4"
kxml2 = "2.3.0"
layoutlib = "15.0.3"
layoutlib = "16.1.0-jdk17"
layoutlib-api = "31.13.2"
slf4j = "1.7.36"
okio = "3.4.0"
protobuf = "3.19.3"
Expand All @@ -14,7 +15,7 @@ protobuf = "3.19.3"
android-tools-build-aapt2-proto = { module = "com.android.tools.build:aapt2-proto", version.ref = "aapt2" }
android-tools-common = { module = "com.android.tools:common", version.ref = "android-tools" }
android-tools-external-intellij-core = { module = "com.android.tools.external.com-intellij:intellij-core", version.ref = "android-tools" }
android-tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
android-tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "layoutlib-api" }
android-tools-layoutlib = { module = "com.android.tools.layoutlib:layoutlib", version.ref = "layoutlib" }
android-tools-layoutlib-resources = { module = "com.android.tools.layoutlib:layoutlib-resources", version.ref = "layoutlib" }
android-tools-layoutlib-runtime = { module = "com.android.tools.layoutlib:layoutlib-runtime", version.ref = "layoutlib" }
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/android/resources/base/BasicResourceItemBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ public ResourceReference getReferenceToSelf() {
return asReference();
}

@Override
public void setValue(String value) {
throw new UnsupportedOperationException();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/io/johnsonlee/playground/sandbox/DeviceModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ enum class DeviceModel(
screenWidth = 1080,
xdpi = 442,
ydpi = 444,
density = Density.DPI_440,
density = Density.create(440),
ratio = ScreenRatio.LONG,
released = "October 15, 2020"
)
Expand Down
7 changes: 6 additions & 1 deletion src/main/kotlin/io/johnsonlee/playground/sandbox/Environment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,11 @@ data class Environment(
val platformDataDir = platformDataRoot.resolve("data")
val fontLocation = platformDataDir.resolve("fonts")
val nativeLibLocation = platformDataDir.resolve(Environment.nativeLibDir)
val icuLocation = platformDataDir.resolve("icu").resolve("icudt70l.dat")
val icuDir = platformDataDir.resolve("icu")
val icuLocation = icuDir.listFiles { f -> f.name.startsWith("icudt") && f.name.endsWith(".dat") }
?.firstOrNull()
?: icuDir.resolve("icudt76l.dat")
val hyphenDataLocation = platformDataDir.resolve("hyphen-data")
val keyboardLocation = platformDataDir.resolve("keyboards").resolve("Generic.kcm")
val buildProp = platformDir.resolve("build.prop")
val attrs = platformDataResDir.resolve("values").resolve("attrs.xml")
Expand All @@ -80,6 +84,7 @@ data class Environment(
fontLocation,
nativeLibLocation.path,
icuLocation.path,
hyphenDataLocation.path,
arrayOf(keyboardLocation.path),
DeviceModel.getEnumMap(attrs),
LayoutLogger
Expand Down