Skip to content
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.

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

chore: Move updateNative(...) into a protected override to seal it #499

Merged
merged 4 commits into from
Jan 15, 2025
Merged
Changes from 1 commit
Commits
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
Next Next commit
chore: Move updateNative(...) into a protected override to seal it
mrousavy committed Jan 15, 2025
commit 59085be14159c61415e60b8a4329aeadec9276a9
2 changes: 1 addition & 1 deletion packages/nitrogen/src/syntax/kotlin/KotlinHybridObject.ts
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ abstract class ${name.HybridTSpec}: ${kotlinBase}() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ abstract class HybridBaseSpec: HybridObject() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ abstract class HybridChildSpec: HybridBaseSpec() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ abstract class HybridImageFactorySpec: HybridObject() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ abstract class HybridImageSpec: HybridObject() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ abstract class HybridTestObjectSwiftKotlinSpec: HybridObject() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ abstract class HybridTestViewSpec: HybridView() {
/**
* Call from a child class to initialize HybridData with a child.
*/
override fun updateNative(hybridData: HybridData) {
override protected fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
super.updateNative(hybridData)
}
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import com.facebook.proguard.annotations.DoNotStrip
*/
@Keep
@DoNotStrip
abstract class HybridObject: ExtendableHybridClass {
abstract class HybridObject {
/**
* Get the memory size of the Kotlin instance (plus any external heap allocations),
* in bytes.
@@ -41,8 +41,9 @@ abstract class HybridObject: ExtendableHybridClass {
/**
* Must be called in the constructor of a subclass of `HybridObject`, to initialize the C++
* `JHybridObject` with a subclass of it.
* If this is not called, an inheritance chain with overridden methods will be lost.
*/
override fun updateNative(hybridData: HybridData) {
protected open fun updateNative(hybridData: HybridData) {
mHybridData = hybridData
}
}

This file was deleted.