From 0ca2eb6ccb8740319857e5e7ef92ca716866ed7a Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Sat, 12 Aug 2023 19:00:35 -0700
Subject: [PATCH 1/2] fix(rive): touchups wip

---
 apps/demo-angular/package.json                |   7 +-
 apps/demo-angular/src/app-routing.module.ts   |   5 -
 apps/demo-angular/src/home.component.ts       |  15 -
 apps/demo/package.json                        |   7 +-
 apps/demo/src/main-page.xml                   |   5 -
 .../{flutter.ts => flutter.ts_off}            |   0
 .../{flutter.xml => flutter.xml_off}          |   0
 ...{ionic-portals.ts => ionic-portals.ts_off} |   0
 ...onic-portals.xml => ionic-portals.xml_off} |   0
 ...pack-compose.ts => jetpack-compose.ts_off} |   0
 ...ck-compose.xml => jetpack-compose.xml_off} |   0
 .../{swift-ui.ts => swift-ui.ts_off}          |   0
 .../{swift-ui.xml => swift-ui.xml_off}        |   0
 .../{ui-charts.ts => ui-charts.ts_off}        |   0
 .../{ui-charts.xml => ui-charts.xml_off}      |   0
 packages/rive/README.md                       |  81 +-
 packages/rive/index.android.ts                |   2 +
 packages/rive/package.json                    |   3 +-
 packages/rive/typings/android.d.ts            | 993 ++++++++++++------
 tools/assets/App_Resources/Android/app.gradle |  28 +
 .../App_Resources/Android/gradle.properties   |   1 +
 .../java/{BasicView.kt => BasicView.ktOFF}    |   0
 .../{ColorPicker.kt => ColorPicker.ktOFF}     |   0
 .../{FlyingHearts.kt => FlyingHearts.ktOFF}   |   0
 tools/demo/index.ts                           |   5 -
 25 files changed, 786 insertions(+), 366 deletions(-)
 rename apps/demo/src/plugin-demos/{flutter.ts => flutter.ts_off} (100%)
 rename apps/demo/src/plugin-demos/{flutter.xml => flutter.xml_off} (100%)
 rename apps/demo/src/plugin-demos/{ionic-portals.ts => ionic-portals.ts_off} (100%)
 rename apps/demo/src/plugin-demos/{ionic-portals.xml => ionic-portals.xml_off} (100%)
 rename apps/demo/src/plugin-demos/{jetpack-compose.ts => jetpack-compose.ts_off} (100%)
 rename apps/demo/src/plugin-demos/{jetpack-compose.xml => jetpack-compose.xml_off} (100%)
 rename apps/demo/src/plugin-demos/{swift-ui.ts => swift-ui.ts_off} (100%)
 rename apps/demo/src/plugin-demos/{swift-ui.xml => swift-ui.xml_off} (100%)
 rename apps/demo/src/plugin-demos/{ui-charts.ts => ui-charts.ts_off} (100%)
 rename apps/demo/src/plugin-demos/{ui-charts.xml => ui-charts.xml_off} (100%)
 create mode 100644 tools/assets/App_Resources/Android/gradle.properties
 rename tools/assets/App_Resources/Android/src/main/java/{BasicView.kt => BasicView.ktOFF} (100%)
 rename tools/assets/App_Resources/Android/src/main/java/{ColorPicker.kt => ColorPicker.ktOFF} (100%)
 rename tools/assets/App_Resources/Android/src/main/java/{FlyingHearts.kt => FlyingHearts.ktOFF} (100%)

diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json
index 720c6d4..27b0a26 100644
--- a/apps/demo-angular/package.json
+++ b/apps/demo-angular/package.json
@@ -2,12 +2,7 @@
   "main": "./src/main.ts",
   "dependencies": {
     "@nativescript/core": "file:../../node_modules/@nativescript/core",
-    "@nativescript/rive": "file:../../dist/packages/rive",
-    "@nativescript/flutter": "file:../../dist/packages/flutter",
-    "@nativescript/ionic-portals": "file:../../dist/packages/ionic-portals",
-    "@nativescript/jetpack-compose": "file:../../dist/packages/jetpack-compose",
-    "@nativescript/swift-ui": "file:../../dist/packages/swift-ui",
-    "@nativescript/ui-charts": "file:../../dist/packages/ui-charts"
+    "@nativescript/rive": "file:../../dist/packages/rive"
   },
   "devDependencies": {
     "@nativescript/android": "~8.5.0",
diff --git a/apps/demo-angular/src/app-routing.module.ts b/apps/demo-angular/src/app-routing.module.ts
index cba9cea..5b9d568 100644
--- a/apps/demo-angular/src/app-routing.module.ts
+++ b/apps/demo-angular/src/app-routing.module.ts
@@ -7,12 +7,7 @@ import { HomeComponent } from './home.component';
 const routes: Routes = [
   { path: '', redirectTo: '/home', pathMatch: 'full' },
   { path: 'home', component: HomeComponent },
-  { path: 'flutter', loadChildren: () => import('./plugin-demos/flutter.module').then((m) => m.FlutterModule) },
-  { path: 'ionic-portals', loadChildren: () => import('./plugin-demos/ionic-portals.module').then((m) => m.IonicPortalsModule) },
-  { path: 'jetpack-compose', loadChildren: () => import('./plugin-demos/jetpack-compose.module').then((m) => m.JetpackComposeModule) },
   { path: 'rive', loadChildren: () => import('./plugin-demos/rive.module').then((m) => m.RiveModule) },
-  { path: 'swift-ui', loadChildren: () => import('./plugin-demos/swift-ui.module').then((m) => m.SwiftUiModule) },
-  { path: 'ui-charts', loadChildren: () => import('./plugin-demos/ui-charts.module').then((m) => m.UiChartsModule) },
 ];
 
 @NgModule({
diff --git a/apps/demo-angular/src/home.component.ts b/apps/demo-angular/src/home.component.ts
index f1a154a..539f520 100644
--- a/apps/demo-angular/src/home.component.ts
+++ b/apps/demo-angular/src/home.component.ts
@@ -6,23 +6,8 @@ import { Component } from '@angular/core';
 })
 export class HomeComponent {
   demos = [
-    {
-      name: 'flutter',
-    },
-    {
-      name: 'ionic-portals',
-    },
-    {
-      name: 'jetpack-compose',
-    },
     {
       name: 'rive',
     },
-    {
-      name: 'swift-ui',
-    },
-    {
-      name: 'ui-charts',
-    },
   ];
 }
diff --git a/apps/demo/package.json b/apps/demo/package.json
index fb5dcfc..f0ccfd4 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -5,12 +5,7 @@
   "repository": "<fill-your-repository-here>",
   "dependencies": {
     "@nativescript/core": "file:../../node_modules/@nativescript/core",
-    "@nativescript/rive": "file:../../packages/rive",
-    "@nativescript/flutter": "file:../../packages/flutter",
-    "@nativescript/ionic-portals": "file:../../packages/ionic-portals",
-    "@nativescript/jetpack-compose": "file:../../packages/jetpack-compose",
-    "@nativescript/swift-ui": "file:../../packages/swift-ui",
-    "@nativescript/ui-charts": "file:../../packages/ui-charts"
+    "@nativescript/rive": "file:../../packages/rive"
   },
   "devDependencies": {
     "@nativescript/android": "~8.5.0",
diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
index 385d532..4adb2a8 100644
--- a/apps/demo/src/main-page.xml
+++ b/apps/demo/src/main-page.xml
@@ -5,12 +5,7 @@
   <StackLayout class="p-20">
     <ScrollView class="h-full">
       <StackLayout>
-        <Button text="flutter" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        <Button text="ionic-portals" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        <Button text="jetpack-compose" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="rive" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        <Button text="swift-ui" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        <Button text="ui-charts" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
   </StackLayout>
diff --git a/apps/demo/src/plugin-demos/flutter.ts b/apps/demo/src/plugin-demos/flutter.ts_off
similarity index 100%
rename from apps/demo/src/plugin-demos/flutter.ts
rename to apps/demo/src/plugin-demos/flutter.ts_off
diff --git a/apps/demo/src/plugin-demos/flutter.xml b/apps/demo/src/plugin-demos/flutter.xml_off
similarity index 100%
rename from apps/demo/src/plugin-demos/flutter.xml
rename to apps/demo/src/plugin-demos/flutter.xml_off
diff --git a/apps/demo/src/plugin-demos/ionic-portals.ts b/apps/demo/src/plugin-demos/ionic-portals.ts_off
similarity index 100%
rename from apps/demo/src/plugin-demos/ionic-portals.ts
rename to apps/demo/src/plugin-demos/ionic-portals.ts_off
diff --git a/apps/demo/src/plugin-demos/ionic-portals.xml b/apps/demo/src/plugin-demos/ionic-portals.xml_off
similarity index 100%
rename from apps/demo/src/plugin-demos/ionic-portals.xml
rename to apps/demo/src/plugin-demos/ionic-portals.xml_off
diff --git a/apps/demo/src/plugin-demos/jetpack-compose.ts b/apps/demo/src/plugin-demos/jetpack-compose.ts_off
similarity index 100%
rename from apps/demo/src/plugin-demos/jetpack-compose.ts
rename to apps/demo/src/plugin-demos/jetpack-compose.ts_off
diff --git a/apps/demo/src/plugin-demos/jetpack-compose.xml b/apps/demo/src/plugin-demos/jetpack-compose.xml_off
similarity index 100%
rename from apps/demo/src/plugin-demos/jetpack-compose.xml
rename to apps/demo/src/plugin-demos/jetpack-compose.xml_off
diff --git a/apps/demo/src/plugin-demos/swift-ui.ts b/apps/demo/src/plugin-demos/swift-ui.ts_off
similarity index 100%
rename from apps/demo/src/plugin-demos/swift-ui.ts
rename to apps/demo/src/plugin-demos/swift-ui.ts_off
diff --git a/apps/demo/src/plugin-demos/swift-ui.xml b/apps/demo/src/plugin-demos/swift-ui.xml_off
similarity index 100%
rename from apps/demo/src/plugin-demos/swift-ui.xml
rename to apps/demo/src/plugin-demos/swift-ui.xml_off
diff --git a/apps/demo/src/plugin-demos/ui-charts.ts b/apps/demo/src/plugin-demos/ui-charts.ts_off
similarity index 100%
rename from apps/demo/src/plugin-demos/ui-charts.ts
rename to apps/demo/src/plugin-demos/ui-charts.ts_off
diff --git a/apps/demo/src/plugin-demos/ui-charts.xml b/apps/demo/src/plugin-demos/ui-charts.xml_off
similarity index 100%
rename from apps/demo/src/plugin-demos/ui-charts.xml
rename to apps/demo/src/plugin-demos/ui-charts.xml_off
diff --git a/packages/rive/README.md b/packages/rive/README.md
index ef3d6c6..6b7494f 100644
--- a/packages/rive/README.md
+++ b/packages/rive/README.md
@@ -62,6 +62,24 @@ For Android, add this provider to your `AndroidManifest.xml` inside the `applica
         </provider>
 ```
 
+#### Gradle settings
+
+Add this to your `app.gradle` inside the `android` section:
+
+```yml
+kotlinOptions {
+    jvmTarget = '1.8'
+}
+```
+
+Ensure your gradle settings are setup to use Kotlin by adding a `gradle.properties` file (right next to your `app.gradle`) with the following:
+
+```yml
+useKotlin=true
+```
+
+## RiveView
+
 Use `RiveView`:
 
 ```xml
@@ -73,7 +91,7 @@ Use `RiveView`:
 </Page>
 ```
 
-When using flavors, you can just register the element for usage in your markup:
+When using flavors, you can register the element for usage in your markup:
 
 ```ts
 import { RiveView } from '@nativescript/rive'
@@ -132,6 +150,67 @@ function loadedRive(args) {
 ```
 
 
+## Troubleshooting
+
+When configuring your Android app for Rive you may run into the following issues. Here's some solutions.
+
+- Error 1
+
+```
+Execution failed for task ':app:checkDebugDuplicateClasses'.
+Duplicate class kotlin.collections.jdk8.CollectionsJDK8Kt found in modules jetified-kotlin-stdlib-1.8.21 (org.jetbrains.kotlin:kotlin-stdlib:1.8.21) and jetified-kotlin-stdlib-jdk8-1.6.21 (org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21)
+Duplicate class kotlin.internal.jdk7.JDK7PlatformImplementations found in modules jetified-kotlin-stdlib-1.8.21 (org.jetbrains.kotlin:kotlin-stdlib:1.8.21) and jetified-kotlin-stdlib-jdk7-1.6.21 (org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21)
+```
+
+**Solution**
+
+Add the following dependency constraints to the top of your `app.gradle` above the android section:
+```
+dependencies {
+    constraints {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" 
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21"
+    }
+}
+```
+
+- Error 2
+
+```bash
+Execution failed for task ':app:mergeDebugNativeLibs'.
+2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs:
+ - /Users/you/.gradle/caches/transforms-3/fed290951dd20dba6bd42d7106bb3f26/transformed/jetified-rive-android-8.1.3/jni/arm64-v8a/libc++_shared.so
+```
+
+**Solution**
+
+Add this section to `app.gradle` android section:
+
+```bash
+android {
+    // other configurations
+
+    packagingOptions {
+        pickFirst 'lib/armeabi-v7a/libRSSupport.so'
+        pickFirst 'lib/arm64-v8a/libRSSupport.so'
+        pickFirst 'lib/x86_64/libRSSupport.so'
+        pickFirst 'lib/x86/libRSSupport.so'
+        pickFirst 'lib/armeabi-v7a/librsjni.so'
+        pickFirst 'lib/arm64-v8a/librsjni.so'
+        pickFirst 'lib/x86_64/librsjni.so'
+        pickFirst 'lib/x86/librsjni.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/librsjni_androidx.so'
+        pickFirst 'lib/arm64-v8a/librsjni_androidx.so'
+        pickFirst 'lib/x86_64/librsjni_androidx.so'
+        pickFirst 'lib/x86/librsjni_androidx.so'
+  }
+}
+```
+
 ## License
 
 Apache License Version 2.0
diff --git a/packages/rive/index.android.ts b/packages/rive/index.android.ts
index 17c33f3..bd89c08 100644
--- a/packages/rive/index.android.ts
+++ b/packages/rive/index.android.ts
@@ -47,6 +47,8 @@ export class RiveView extends RiveViewBase {
 
   constructor() {
     super();
+    console.log('here?');
+    console.log('app.rive.runtime.kotlin.RiveAnimationView:', app.rive.runtime.kotlin.RiveAnimationView);
     this.events = new RiveEvents(this);
   }
 
diff --git a/packages/rive/package.json b/packages/rive/package.json
index 5ade295..ce0d145 100644
--- a/packages/rive/package.json
+++ b/packages/rive/package.json
@@ -19,7 +19,8 @@
     "JavaScript",
     "TypeScript",
     "iOS",
-    "Android"
+    "Android",
+    "Rive"
   ],
   "author": {
     "name": "NativeScript",
diff --git a/packages/rive/typings/android.d.ts b/packages/rive/typings/android.d.ts
index 633c237..91d4832 100644
--- a/packages/rive/typings/android.d.ts
+++ b/packages/rive/typings/android.d.ts
@@ -2,12 +2,15 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class BuildConfig {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          public static DEBUG: boolean;
-          public static LIBRARY_PACKAGE_NAME: string;
-          public static BUILD_TYPE: string;
+        export class Observable<ListenerType> extends java.lang.Object {
+          public static class: java.lang.Class<app.rive.runtime.any>;
+          /**
+           * Constructs a new instance of the app.rive.runtime.any interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+           */
+          public constructor(implementation: { registerListener(param0: ListenerType): void; unregisterListener(param0: ListenerType): void });
           public constructor();
+          public registerListener(param0: ListenerType): void;
+          public unregisterListener(param0: ListenerType): void;
         }
       }
     }
@@ -18,17 +21,13 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class DetachedRiveState {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          public constructor(param0: java.util.List<string>, param1: java.util.List<string>);
-          public getPlayingAnimationsNames(): java.util.List<string>;
-          public getPlayingStateMachineNames(): java.util.List<string>;
-          public equals(param0: any): boolean;
-          public toString(): string;
-          public component1(): java.util.List<string>;
-          public component2(): java.util.List<string>;
-          public hashCode(): number;
-          public copy(param0: java.util.List<string>, param1: java.util.List<string>): app.rive.runtime.kotlin;
+        export class PointerEvents {
+          public static class: java.lang.Class<app.rive.runtime.any>;
+          public static POINTER_DOWN: app.rive.runtime.any;
+          public static POINTER_UP: app.rive.runtime.any;
+          public static POINTER_MOVE: app.rive.runtime.any;
+          public static valueOf(param0: string): app.rive.runtime.any;
+          public static values(): androidNative.Array<app.rive.runtime.any>;
         }
       }
     }
@@ -39,32 +38,34 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class Observable<ListenerType> extends java.lang.Object {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          /**
-           * Constructs a new instance of the app.rive.runtime.kotlin interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
-           */
-          public constructor(implementation: { registerListener(param0: ListenerType): void; unregisterListener(param0: ListenerType): void });
-          public constructor();
-          public registerListener(param0: ListenerType): void;
-          public unregisterListener(param0: ListenerType): void;
+        export abstract class ResourceType {
+          public static class: java.lang.Class<app.rive.runtime.any>;
         }
-      }
-    }
-  }
-}
-
-declare module app {
-  export module rive {
-    export module runtime {
-      export module kotlin {
-        export class PointerEvents {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          public static POINTER_DOWN: app.rive.runtime.kotlin;
-          public static POINTER_UP: app.rive.runtime.kotlin;
-          public static POINTER_MOVE: app.rive.runtime.kotlin;
-          public static valueOf(param0: string): app.rive.runtime.kotlin;
-          public static values(): androidNative.Array<app.rive.runtime.kotlin>;
+        export module ResourceType {
+          export class Companion {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public makeMaybeResource(param0: any): app.rive.runtime.any;
+          }
+          export class ResourceBytes extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public constructor(param0: androidNative.Array<number>);
+            public getBytes(): androidNative.Array<number>;
+          }
+          export class ResourceId extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public constructor(param0: number);
+            public getId(): number;
+          }
+          export class ResourceRiveFile extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getFile(): app.rive.runtime.any;
+            public constructor(param0: app.rive.runtime.any);
+          }
+          export class ResourceUrl extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getUrl(): string;
+            public constructor(param0: string);
+          }
         }
       }
     }
@@ -75,88 +76,91 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class RiveAnimationView extends app.rive.runtime.kotlin implements app.rive.runtime.kotlin {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
+        export class RiveAnimationView extends app.rive.runtime.any implements app.rive.runtime.any {
+          public static class: java.lang.Class<app.rive.runtime.any>;
           public static TAG: string;
-          public setFit(param0: app.rive.runtime.kotlin): void;
-          public setBooleanState(param0: string, param1: string, param2: boolean): void;
-          public getStateMachines(): java.util.List<app.rive.runtime.kotlin>;
-          public setRiveBytes(bytes: java.lang.Byte, artboardName: string, animationName: string, stateMachineName: string, autoplay: boolean, fit: app.rive.runtime.kotlin.core.Fit, alignment: app.rive.runtime.kotlin.core.Alignment, loop: app.rive.runtime.kotlin.core.Loop): void;
-          public getFit(): app.rive.runtime.kotlin;
-          public setRiveResource(resId: number, artboardName: string, animationName: string, stateMachineName: string, autoplay: boolean, fit: app.rive.runtime.kotlin.core.Fit, alignment: app.rive.runtime.kotlin.core.Alignment, loop: app.rive.runtime.kotlin.core.Loop): void;
-          public unregisterListener(param0: any): void;
+          public static alignmentIndexDefault: number;
+          public static fitIndexDefault: number;
+          public static loopIndexDefault: number;
+          public setFit(param0: app.rive.runtime.any): void;
+          public getStateMachines(): java.util.List<app.rive.runtime.any>;
+          public getFit(): app.rive.runtime.any;
+          public setRiveResource(param0: number, param1: string, param2: string, param3: string, param4: boolean, param5: app.rive.runtime.any, param6: app.rive.runtime.any, param7: app.rive.runtime.any): void;
           public setArtboardName(param0: string): void;
-          public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.kotlin>;
-          public stop(param0: string, param1: boolean): void;
-          public play(loop: app.rive.runtime.kotlin.core.Loop, direction: app.rive.runtime.kotlin.core.Direction, settleInitialState: boolean): void;
+          public play(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: boolean): void;
           public setNumberState(param0: string, param1: string, param2: number): void;
-          public play(animationName: string, loop: app.rive.runtime.kotlin.core.Loop, direction: app.rive.runtime.kotlin.core.Direction, isStateMachine: boolean, settleInitialState: boolean): void;
           public onAttachedToWindow(): void;
-          public constructor(param0: globalAndroid.content.Context, param1?: globalAndroid.util.AttributeSet);
+          public constructor(param0: globalAndroid.content.Context, param1: globalAndroid.util.AttributeSet);
           public onSurfaceTextureAvailable(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
-          public unregisterListener(param0: app.rive.runtime.kotlin): void;
           public pause(): void;
+          public unregisterListener(param0: app.rive.runtime.any): void;
+          public getController(): app.rive.runtime.any;
+          public createRenderer(): app.rive.runtime.any;
+          public getAutoplay(): boolean;
+          public stop(param0: java.util.List<string>, param1: boolean): void;
+          public setAlignment(param0: app.rive.runtime.any): void;
+          public restoreControllerState(param0: app.rive.runtime.any): void;
+          public registerListener(param0: app.rive.runtime.any): void;
+          public getArtboardRenderer(): app.rive.runtime.any;
+          public stop(): void;
+          public setAutoplay(param0: boolean): void;
+          public onTouchEvent(param0: globalAndroid.view.MotionEvent): boolean;
+          public pause(param0: java.util.List<string>, param1: boolean): void;
+          public getAnimations(): java.util.List<app.rive.runtime.any>;
+          public onSurfaceTextureSizeChanged(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
+          public getFile(): app.rive.runtime.any;
+          public getRendererAttributes(): app.rive.runtime.any;
+          public setBooleanState(param0: string, param1: string, param2: boolean): void;
+          public setRiveBytes(param0: androidNative.Array<number>, param1: string, param2: string, param3: string, param4: boolean, param5: app.rive.runtime.any, param6: app.rive.runtime.any, param7: app.rive.runtime.any): void;
+          public saveControllerState(): app.rive.runtime.any;
+          public unregisterListener(param0: any): void;
+          public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.any>;
+          public stop(param0: string, param1: boolean): void;
+          public play(param0: string, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
           public isPlaying(): boolean;
-          public play(animationNames: java.util.List<string>, loop: app.rive.runtime.kotlin.core.Loop, direction: app.rive.runtime.kotlin.core.Direction, areStateMachines: boolean, settleInitialState: boolean): void;
+          public play(param0: java.util.List<string>, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
+          public createObserver(): androidx.lifecycle.LifecycleObserver;
           public pause(param0: string, param1: boolean): void;
-          public getAutoplay(): boolean;
+          public setTextRunValue(param0: string, param1: string): void;
+          public setRiveFile(param0: app.rive.runtime.any, param1: string, param2: string, param3: string, param4: boolean, param5: app.rive.runtime.any, param6: app.rive.runtime.any, param7: app.rive.runtime.any): void;
           public onDetachedFromWindow(): void;
           public onMeasure(param0: number, param1: number): void;
-          public registerListener(param0: app.rive.runtime.kotlin): void;
           public reset(): void;
-          public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.kotlin>;
-          public getRenderer(): app.rive.runtime.kotlin;
-          public stop(param0: java.util.List<string>, param1: boolean): void;
-          public setAlignment(param0: app.rive.runtime.kotlin): void;
+          public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.any>;
           public getArtboardName(): string;
           public fireState(param0: string, param1: string): void;
-          public makeRenderer(): app.rive.runtime.kotlin;
-          public getRenderer(): app.rive.runtime.kotlin;
-          public stop(): void;
-          public setAutoplay(param0: boolean): void;
-          public onTouchEvent(param0: globalAndroid.view.MotionEvent): boolean;
-          public getAlignment(): app.rive.runtime.kotlin;
-          public pause(animationNames: java.util.List<string>, areStateMachines: boolean): void;
+          public getTextRunValue(param0: string): string;
+          public setController(param0: app.rive.runtime.any): void;
+          public getAlignment(): app.rive.runtime.any;
           public getDefaultAutoplay(): boolean;
           public registerListener(param0: any): void;
-          public getAnimations(): java.util.List<app.rive.runtime.kotlin>;
-          public onSurfaceTextureSizeChanged(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
-          public getFile(): app.rive.runtime.kotlin;
         }
         export module RiveAnimationView {
           export class Companion {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          }
-          export class RendererAttrs {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public getLoopIndex(): number;
-            public hashCode(): number;
-            public equals(param0: any): boolean;
-            public constructor(param0: number, param1: number, param2: number, param3: boolean, param4: boolean, param5: string, param6: string, param7: string, param8: number, param9: string);
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRendererIndexDefault(): number;
+          }
+          export class RendererAttributes {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public setAutoplay(param0: boolean): void;
+            public setResource(param0: app.rive.runtime.any): void;
+            public getArtboardName(): string;
+            public setStateMachineName(param0: string): void;
+            public getResource(): app.rive.runtime.any;
+            public setFit(param0: app.rive.runtime.any): void;
+            public constructor(param0: number, param1: number, param2: number, param3: number, param4: boolean, param5: boolean, param6: string, param7: string, param8: string, param9: app.rive.runtime.any);
             public getAnimationName(): string;
             public getAutoplay(): boolean;
-            public component2(): number;
-            public component9(): number;
+            public setAnimationName(param0: string): void;
+            public getAlignment(): app.rive.runtime.any;
             public getStateMachineName(): string;
-            public copy(param0: number, param1: number, param2: number, param3: boolean, param4: boolean, param5: string, param6: string, param7: string, param8: number, param9: string): app.rive.runtime.kotlin;
-            public getFit(): app.rive.runtime.kotlin;
-            public component10(): string;
+            public setAlignment(param0: app.rive.runtime.any): void;
+            public setArtboardName(param0: string): void;
+            public getLoop(): app.rive.runtime.any;
+            public getFit(): app.rive.runtime.any;
+            public setLoop(param0: app.rive.runtime.any): void;
             public getRiveTraceAnimations(): boolean;
-            public component1(): number;
-            public component8(): string;
-            public component4(): boolean;
-            public component5(): boolean;
-            public getArtboardName(): string;
-            public component7(): string;
-            public getUrl(): string;
-            public getResourceId(): number;
-            public toString(): string;
-            public getAlignment(): app.rive.runtime.kotlin;
-            public getFitIndex(): number;
-            public getLoop(): app.rive.runtime.kotlin;
-            public getAlignmentIndex(): number;
-            public component6(): string;
-            public component3(): number;
+            public getRendererType(): app.rive.runtime.any;
           }
         }
       }
@@ -168,75 +172,89 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class RiveArtboardRenderer extends app.rive.runtime.kotlin implements app.rive.runtime.kotlin {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          public setFit(param0: app.rive.runtime.kotlin): void;
-          public getStateMachines(): java.util.List<app.rive.runtime.kotlin>;
-          public setLoop(param0: app.rive.runtime.kotlin): void;
-          public getFit(): app.rive.runtime.kotlin;
+        export class RiveArtboardRenderer extends app.rive.runtime.any {
+          public static class: java.lang.Class<app.rive.runtime.any>;
+          public setFit(param0: app.rive.runtime.any): void;
+          public getStateMachines(): java.util.List<app.rive.runtime.any>;
+          /** @deprecated */
+          public stopAnimations(param0: java.util.List<string>, param1: boolean): void;
+          public setLoop(param0: app.rive.runtime.any): void;
+          /** @deprecated */
+          public pause(param0: string, param1: boolean): void;
+          public getFit(): app.rive.runtime.any;
+          /** @deprecated */
+          public play(param0: string, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
           public setArtboardName(param0: string): void;
-          public play(param0: app.rive.runtime.kotlin, param1: app.rive.runtime.kotlin, param2: boolean): void;
-          public setNumberState(param0: string, param1: string, param2: number): void;
-          public getLoop(): app.rive.runtime.kotlin;
+          /** @deprecated */
+          public play(param0: java.util.List<string>, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
+          public getLoop(): app.rive.runtime.any;
           public constructor();
-          public pause(): void;
-          public stopAnimations(): void;
           public getAutoplay(): boolean;
-          public registerListener(param0: app.rive.runtime.kotlin): void;
-          public setAlignment(param0: app.rive.runtime.kotlin): void;
-          public stopAnimations(param0: java.util.List<string>, param1: boolean): void;
+          /** @deprecated */
+          public pause(): void;
+          public acquire(): number;
+          public setAlignment(param0: app.rive.runtime.any): void;
+          public acquireFile$any_release(param0: app.rive.runtime.any): void;
           public getAnimationName(): string;
           public artboardBounds(): globalAndroid.graphics.RectF;
           public setAnimationName(param0: string): void;
-          public setAutoplay(param0: boolean): void;
-          public setRiveFile(param0: app.rive.runtime.kotlin): void;
-          public pause(param0: java.util.List<string>, param1: boolean): void;
+          /** @deprecated */
           public stopAnimations(param0: string, param1: boolean): void;
+          public setAutoplay(param0: boolean): void;
+          public setRiveFile(param0: app.rive.runtime.any): void;
           public getStateMachineName(): string;
-          public getAnimations(): java.util.List<app.rive.runtime.kotlin>;
-          public getFile(): app.rive.runtime.kotlin;
-          public setBooleanState(param0: string, param1: string, param2: boolean): void;
+          public getAnimations(): java.util.List<app.rive.runtime.any>;
+          public getFile(): app.rive.runtime.any;
+          /** @deprecated */
+          public stopAnimations(): void;
+          /** @deprecated */
+          public setNumberState(param0: string, param1: string, param2: number): void;
+          public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+          /** @deprecated */
+          public pause(param0: java.util.List<string>, param1: boolean): void;
           public setTargetBounds(param0: globalAndroid.graphics.RectF): void;
-          public unregisterListener(param0: any): void;
-          public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.kotlin>;
-          public play(param0: string, param1: app.rive.runtime.kotlin, param2: app.rive.runtime.kotlin, param3: boolean, param4: boolean): void;
-          public constructor(param0: app.rive.runtime.kotlin, param1: app.rive.runtime.kotlin, param2: app.rive.runtime.kotlin, param3: string, param4: string, param5: string, param6: boolean, param7: boolean);
-          public unregisterListener(param0: app.rive.runtime.kotlin): void;
-          public play(param0: java.util.List<string>, param1: app.rive.runtime.kotlin, param2: app.rive.runtime.kotlin, param3: boolean, param4: boolean): void;
-          public clear(): void;
-          public pause(param0: string, param1: boolean): void;
+          public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.any>;
+          public constructor(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: string, param5: string, param6: string, param7: boolean, param8: app.rive.runtime.any, param9: app.rive.runtime.any);
+          public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+          public setActiveArtboard(param0: app.rive.runtime.any): void;
           public draw(): void;
           public getTargetBounds(): globalAndroid.graphics.RectF;
+          /** @deprecated */
+          public setBooleanState(param0: string, param1: string, param2: boolean): void;
+          public release(): number;
           public constructor(param0: number);
           public reset(): void;
+          public getRefCount(): number;
           public advance(param0: number): void;
-          public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.kotlin>;
+          /** @deprecated */
+          public play(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: boolean): void;
+          public constructor(param0: app.rive.runtime.any, param1: boolean);
+          public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.any>;
           public getArtboardName(): string;
-          public fireState(param0: string, param1: string): void;
           public setArtboardByName(param0: string): void;
-          public constructor(param0: boolean);
           public setStateMachineName(param0: string): void;
-          public pointerEvent(param0: app.rive.runtime.kotlin, param1: number, param2: number): void;
-          public getAlignment(): app.rive.runtime.kotlin;
-          public getActiveArtboard(): app.rive.runtime.kotlin;
-          public registerListener(param0: any): void;
+          /** @deprecated */
+          public fireState(param0: string, param1: string): void;
+          public pointerEvent(param0: app.rive.runtime.any, param1: number, param2: number): void;
+          public getAlignment(): app.rive.runtime.any;
+          public getActiveArtboard(): app.rive.runtime.any;
         }
         export module RiveArtboardRenderer {
           export class Listener {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
             /**
-             * Constructs a new instance of the app.rive.runtime.kotlin$Listener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+             * Constructs a new instance of the app.rive.runtime.any$Listener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
              */
-            public constructor(implementation: { notifyPlay(param0: app.rive.runtime.kotlin): void; notifyPause(param0: app.rive.runtime.kotlin): void; notifyStop(param0: app.rive.runtime.kotlin): void; notifyLoop(param0: app.rive.runtime.kotlin): void; notifyStateChanged(param0: string, param1: string): void });
+            public constructor(implementation: { notifyPlay(param0: app.rive.runtime.any): void; notifyPause(param0: app.rive.runtime.any): void; notifyStop(param0: app.rive.runtime.any): void; notifyLoop(param0: app.rive.runtime.any): void; notifyStateChanged(param0: string, param1: string): void });
             public constructor();
-            public notifyLoop(param0: app.rive.runtime.kotlin): void;
-            public notifyStop(param0: app.rive.runtime.kotlin): void;
-            public notifyPause(param0: app.rive.runtime.kotlin): void;
-            public notifyPlay(param0: app.rive.runtime.kotlin): void;
+            public notifyLoop(param0: app.rive.runtime.any): void;
+            public notifyStop(param0: app.rive.runtime.any): void;
+            public notifyPause(param0: app.rive.runtime.any): void;
+            public notifyPlay(param0: app.rive.runtime.any): void;
             public notifyStateChanged(param0: string, param1: string): void;
           }
           export class WhenMappings {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
           }
         }
       }
@@ -248,11 +266,11 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export class RiveFileRequest extends com.android.volley.Request<app.rive.runtime.kotlin> {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
-          public constructor(param0: string, param1: com.android.volley.Response.Listener<app.rive.runtime.kotlin>, param2: com.android.volley.Response.ErrorListener);
-          public parseNetworkResponse(param0: com.android.volley.NetworkResponse): com.android.volley.Response<app.rive.runtime.kotlin>;
-          public deliverResponse(param0: app.rive.runtime.kotlin): void;
+        export class RiveFileRequest extends com.android.volley.Request<app.rive.runtime.any> {
+          public static class: java.lang.Class<app.rive.runtime.any>;
+          public parseNetworkResponse(param0: com.android.volley.NetworkResponse): com.android.volley.Response<app.rive.runtime.any>;
+          public deliverResponse(param0: app.rive.runtime.any): void;
+          public constructor(param0: string, param1: app.rive.runtime.any, param2: com.android.volley.Response.Listener<app.rive.runtime.any>, param3: com.android.volley.Response.ErrorListener);
         }
       }
     }
@@ -264,7 +282,7 @@ declare module app {
     export module runtime {
       export module kotlin {
         export class RiveInitializer extends androidx.startup.Initializer<any> {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          public static class: java.lang.Class<app.rive.runtime.any>;
           public create(param0: globalAndroid.content.Context): void;
           public constructor();
           public dependencies(): java.util.List<java.lang.Class<any>>;
@@ -279,22 +297,26 @@ declare module app {
     export module runtime {
       export module kotlin {
         export abstract class RiveTextureView {
-          public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          public static class: java.lang.Class<app.rive.runtime.any>;
           public static TAG: string;
-          public constructor(param0: globalAndroid.content.Context, param1: globalAndroid.util.AttributeSet);
-          public onSurfaceTextureAvailable(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
           public onDetachedFromWindow(): void;
-          public getRenderer(): app.rive.runtime.kotlin;
+          public getLifecycleObserver(): androidx.lifecycle.LifecycleObserver;
+          public setRenderer(param0: app.rive.runtime.any): void;
           public onSurfaceTextureUpdated(param0: globalAndroid.graphics.SurfaceTexture): void;
           public onSurfaceTextureDestroyed(param0: globalAndroid.graphics.SurfaceTexture): boolean;
           public onAttachedToWindow(): void;
           public onVisibilityChanged(param0: globalAndroid.view.View, param1: number): void;
           public getActivity(): globalAndroid.app.Activity;
+          public constructor(param0: globalAndroid.content.Context, param1: globalAndroid.util.AttributeSet);
+          public onSurfaceTextureAvailable(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
+          public getRenderer(): app.rive.runtime.any;
+          public createObserver(): androidx.lifecycle.LifecycleObserver;
+          public createRenderer(): app.rive.runtime.any;
           public onSurfaceTextureSizeChanged(param0: globalAndroid.graphics.SurfaceTexture, param1: number, param2: number): void;
         }
         export module RiveTextureView {
           export class Companion {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
           }
         }
       }
@@ -302,22 +324,60 @@ declare module app {
   }
 }
 
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export class RiveViewLifecycleObserver {
+          public static class: java.lang.Class<app.rive.runtime.any>;
+          public constructor(param0: app.rive.runtime.any);
+          public onPause(param0: androidx.lifecycle.LifecycleOwner): void;
+          public onDestroy(param0: androidx.lifecycle.LifecycleOwner): void;
+          public onCreate(param0: androidx.lifecycle.LifecycleOwner): void;
+          public onResume(param0: androidx.lifecycle.LifecycleOwner): void;
+          public onStart(param0: androidx.lifecycle.LifecycleOwner): void;
+          public onStop(param0: androidx.lifecycle.LifecycleOwner): void;
+        }
+      }
+    }
+  }
+}
+
 declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
         export module controllers {
-          export class LinearAnimationController extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public initialize(param0: any): boolean;
+          export class ControllerState {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getFile(): app.rive.runtime.any;
+            public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.any>;
+            public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.any>;
+            public getActiveArtboard(): app.rive.runtime.any;
+            public constructor(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: java.util.List<app.rive.runtime.any>, param3: java.util.HashSet<app.rive.runtime.any>, param4: java.util.List<app.rive.runtime.any>, param5: java.util.HashSet<app.rive.runtime.any>, param6: boolean);
+            public getStateMachines(): java.util.List<app.rive.runtime.any>;
+            public getAnimations(): java.util.List<app.rive.runtime.any>;
+            public isActive(): boolean;
+            public dispose(): void;
+          }
+        }
+      }
+    }
+  }
+}
+
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module controllers {
+          export class ControllerStateManagement {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            /**
+             * Constructs a new instance of the app.rive.runtime.any interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+             */
+            public constructor(implementation: {});
             public constructor();
-            public initialize(param0: app.rive.runtime.kotlin): boolean;
-            public constructor(param0: string, param1: boolean, param2: number);
-            public setAnimationInstance(param0: app.rive.runtime.kotlin): void;
-            public apply(param0: number): void;
-            public getAnimationInstance(): app.rive.runtime.kotlin;
-            public getMix(): number;
-            public setMix(param0: number): void;
           }
         }
       }
@@ -330,16 +390,94 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module controllers {
-          export abstract class RiveController<T> extends java.lang.Object {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class RiveFileController extends java.lang.Object {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static TAG: string;
+            public getPlayingStateMachines(): java.util.HashSet<app.rive.runtime.any>;
+            public getPausedAnimations(): java.util.Set<app.rive.runtime.any>;
+            public registerListener(param0: app.rive.runtime.any): void;
+            public pause(): void;
+            public pause(param0: java.util.List<string>, param1: boolean): void;
+            public setFit(param0: app.rive.runtime.any): void;
+            public stopAnimations(): void;
+            public getAnimations(): java.util.List<app.rive.runtime.any>;
+            public getAutoplay(): boolean;
+            public play$any_release(param0: app.rive.runtime.any, param1: boolean): void;
+            public reset$any_release(): void;
+            public setAlignment(param0: app.rive.runtime.any): void;
+            public getFit(): app.rive.runtime.any;
+            public saveControllerState(): app.rive.runtime.any;
+            public play(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: boolean): void;
+            public stopAnimations(param0: string, param1: boolean): void;
+            public registerListener(param0: any): void;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public play(param0: java.util.List<string>, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
             public constructor();
-            public initialize(param0: T): boolean;
-            public onActivate(): void;
-            public setActive(param0: boolean): void;
-            public apply(param0: number): void;
-            public onDeactivate(): void;
+            public setBooleanState(param0: string, param1: string, param2: boolean): void;
+            public setTextRunValue(param0: string, param1: string): void;
+            public setNumberState(param0: string, param1: string, param2: number): void;
+            public release(): number;
+            public unregisterListener(param0: any): void;
+            public restoreControllerState(param0: app.rive.runtime.any): void;
+            public getListeners$any_release(): java.util.HashSet<app.rive.runtime.any>;
+            public advance(param0: number): void;
+            public setListeners$any_release(param0: java.util.HashSet<app.rive.runtime.any>): void;
+            public unregisterListener(param0: app.rive.runtime.any): void;
+            public getAlignment(): app.rive.runtime.any;
+            public getPausedStateMachines(): java.util.Set<app.rive.runtime.any>;
+            public getHasPlayingAnimations(): boolean;
+            public fireState(param0: string, param1: string): void;
+            public setAutoplay(param0: boolean): void;
+            public stopAnimations(param0: java.util.List<string>, param1: boolean): void;
+            public getOnStart(): any;
+            public getStateMachines(): java.util.List<app.rive.runtime.any>;
+            public setFile(param0: app.rive.runtime.any): void;
+            public setActiveArtboard(param0: app.rive.runtime.any): void;
+            public getFile(): app.rive.runtime.any;
+            public play(param0: string, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: boolean): void;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public selectArtboard(param0: string): void;
+            public constructor(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: app.rive.runtime.any, param3: boolean, param4: app.rive.runtime.any, param5: app.rive.runtime.any, param6: any);
+            public acquire(): number;
+            public setLoop(param0: app.rive.runtime.any): void;
+            public setupScene$any_release(param0: app.rive.runtime.any): void;
             public isActive(): boolean;
-            public dispose(): void;
+            public setOnStart(param0: any): void;
+            public setRiveFile(param0: app.rive.runtime.any, param1: string): void;
+            public play$any_release(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: app.rive.runtime.any): void;
+            public setActive(param0: boolean): void;
+            public pause(param0: string, param1: boolean): void;
+            public autoplay(): void;
+            public getPlayingAnimations(): java.util.HashSet<app.rive.runtime.any>;
+            public getLoop(): app.rive.runtime.any;
+            public getActiveArtboard(): app.rive.runtime.any;
+            public getTextRunValue(param0: string): string;
+          }
+          export module RiveFileController {
+            export class Companion {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+            }
+            export class Listener {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              /**
+               * Constructs a new instance of the app.rive.runtime.any$Listener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+               */
+              public constructor(implementation: { notifyPlay(param0: app.rive.runtime.any): void; notifyPause(param0: app.rive.runtime.any): void; notifyStop(param0: app.rive.runtime.any): void; notifyLoop(param0: app.rive.runtime.any): void; notifyStateChanged(param0: string, param1: string): void; notifyAdvance(param0: number): void });
+              public constructor();
+              public notifyPlay(param0: app.rive.runtime.any): void;
+              public notifyStop(param0: app.rive.runtime.any): void;
+              public notifyLoop(param0: app.rive.runtime.any): void;
+              public notifyPause(param0: app.rive.runtime.any): void;
+              public notifyStateChanged(param0: string, param1: string): void;
+              public notifyAdvance(param0: number): void;
+            }
+            export module Listener {
+              export class DefaultImpls {
+                public static class: java.lang.Class<app.rive.runtime.any>;
+                public static notifyAdvance(param0: app.rive.runtime.any, param1: number): void;
+              }
+            }
           }
         }
       }
@@ -353,18 +491,24 @@ declare module app {
       export module kotlin {
         export module core {
           export class Alignment {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static TOP_LEFT: app.rive.runtime.kotlin;
-            public static TOP_CENTER: app.rive.runtime.kotlin;
-            public static TOP_RIGHT: app.rive.runtime.kotlin;
-            public static CENTER_LEFT: app.rive.runtime.kotlin;
-            public static CENTER: app.rive.runtime.kotlin;
-            public static CENTER_RIGHT: app.rive.runtime.kotlin;
-            public static BOTTOM_LEFT: app.rive.runtime.kotlin;
-            public static BOTTOM_CENTER: app.rive.runtime.kotlin;
-            public static BOTTOM_RIGHT: app.rive.runtime.kotlin;
-            public static values(): androidNative.Array<app.rive.runtime.kotlin>;
-            public static valueOf(param0: string): app.rive.runtime.kotlin;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static TOP_LEFT: app.rive.runtime.any;
+            public static TOP_CENTER: app.rive.runtime.any;
+            public static TOP_RIGHT: app.rive.runtime.any;
+            public static CENTER_LEFT: app.rive.runtime.any;
+            public static CENTER: app.rive.runtime.any;
+            public static CENTER_RIGHT: app.rive.runtime.any;
+            public static BOTTOM_LEFT: app.rive.runtime.any;
+            public static BOTTOM_CENTER: app.rive.runtime.any;
+            public static BOTTOM_RIGHT: app.rive.runtime.any;
+            public static values(): androidNative.Array<app.rive.runtime.any>;
+            public static valueOf(param0: string): app.rive.runtime.any;
+          }
+          export module Alignment {
+            export class Companion {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public fromIndex(param0: number): app.rive.runtime.any;
+            }
           }
         }
       }
@@ -377,9 +521,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class AnimationState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class AnimationState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public getName(): string;
             public toString(): string;
           }
@@ -394,9 +543,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class AnyState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class AnyState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -410,24 +564,30 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class Artboard extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public animation(param0: number): app.rive.runtime.kotlin;
-            public animation(param0: string): app.rive.runtime.kotlin;
+          export class Artboard extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public animation(param0: number): app.rive.runtime.any;
+            public animation(param0: string): app.rive.runtime.any;
             public drawSkia(param0: number): void;
+            public release(): number;
             public getAnimationNames(): java.util.List<string>;
             public getStateMachineNames(): java.util.List<string>;
-            public stateMachine(param0: string): app.rive.runtime.kotlin;
+            public stateMachine(param0: string): app.rive.runtime.any;
             public advance(param0: number): boolean;
-            public stateMachine(param0: number): app.rive.runtime.kotlin;
+            public stateMachine(param0: number): app.rive.runtime.any;
             public getName(): string;
-            public getFirstStateMachine(): app.rive.runtime.kotlin;
+            public getFirstStateMachine(): app.rive.runtime.any;
+            public getRefCount(): number;
+            public textRun(param0: string): app.rive.runtime.any;
             public cppDelete(param0: number): void;
-            public getFirstAnimation(): app.rive.runtime.kotlin;
+            public getFirstAnimation(): app.rive.runtime.any;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
             public constructor(param0: number);
             public getAnimationCount(): number;
             public getStateMachineCount(): number;
-            public drawSkia(param0: number, param1: app.rive.runtime.kotlin, param2: app.rive.runtime.kotlin): void;
+            public drawSkia(param0: number, param1: app.rive.runtime.any, param2: app.rive.runtime.any): void;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public getBounds(): globalAndroid.graphics.RectF;
           }
         }
@@ -441,9 +601,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class BlendState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class BlendState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -458,7 +623,7 @@ declare module app {
       export module kotlin {
         export module core {
           export class Decoder {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public constructor();
           }
         }
@@ -473,18 +638,18 @@ declare module app {
       export module kotlin {
         export module core {
           export class Direction {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static BACKWARDS: app.rive.runtime.kotlin;
-            public static FORWARDS: app.rive.runtime.kotlin;
-            public static AUTO: app.rive.runtime.kotlin;
-            public static valueOf(param0: string): app.rive.runtime.kotlin;
-            public static values(): androidNative.Array<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static BACKWARDS: app.rive.runtime.any;
+            public static FORWARDS: app.rive.runtime.any;
+            public static AUTO: app.rive.runtime.any;
+            public static valueOf(param0: string): app.rive.runtime.any;
+            public static values(): androidNative.Array<app.rive.runtime.any>;
             public getValue(): number;
           }
           export module Direction {
             export class Companion {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
-              public fromInt(param0: number): app.rive.runtime.kotlin;
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public fromInt(param0: number): app.rive.runtime.any;
             }
           }
         }
@@ -498,9 +663,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class EntryState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class EntryState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -514,9 +684,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class ExitState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class ExitState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -530,16 +705,22 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class File extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class File extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public artboard(param0: number): app.rive.runtime.any;
+            public release(): number;
+            public constructor(param0: androidNative.Array<number>, param1: app.rive.runtime.any);
             public getArtboardCount(): number;
-            public constructor(param0: androidNative.Array<number>);
             public getArtboardNames(): java.util.List<string>;
-            public artboard(param0: number): app.rive.runtime.kotlin;
+            public getRefCount(): number;
             public cppDelete(param0: number): void;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
             public constructor(param0: number);
-            public getFirstArtboard(): app.rive.runtime.kotlin;
-            public artboard(param0: string): app.rive.runtime.kotlin;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public getRendererType(): app.rive.runtime.any;
+            public getFirstArtboard(): app.rive.runtime.any;
+            public artboard(param0: string): app.rive.runtime.any;
           }
         }
       }
@@ -553,16 +734,22 @@ declare module app {
       export module kotlin {
         export module core {
           export class Fit {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static FILL: app.rive.runtime.kotlin;
-            public static CONTAIN: app.rive.runtime.kotlin;
-            public static COVER: app.rive.runtime.kotlin;
-            public static FIT_WIDTH: app.rive.runtime.kotlin;
-            public static FIT_HEIGHT: app.rive.runtime.kotlin;
-            public static NONE: app.rive.runtime.kotlin;
-            public static SCALE_DOWN: app.rive.runtime.kotlin;
-            public static valueOf(param0: string): app.rive.runtime.kotlin;
-            public static values(): androidNative.Array<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static FILL: app.rive.runtime.any;
+            public static CONTAIN: app.rive.runtime.any;
+            public static COVER: app.rive.runtime.any;
+            public static FIT_WIDTH: app.rive.runtime.any;
+            public static FIT_HEIGHT: app.rive.runtime.any;
+            public static NONE: app.rive.runtime.any;
+            public static SCALE_DOWN: app.rive.runtime.any;
+            public static valueOf(param0: string): app.rive.runtime.any;
+            public static values(): androidNative.Array<app.rive.runtime.any>;
+          }
+          export module Fit {
+            export class Companion {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public fromIndex(param0: number): app.rive.runtime.any;
+            }
           }
         }
       }
@@ -576,9 +763,10 @@ declare module app {
       export module kotlin {
         export module core {
           export class Helpers {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static INSTANCE: app.rive.runtime.kotlin;
-            public convertToArtboardSpace(param0: globalAndroid.graphics.RectF, param1: globalAndroid.graphics.PointF, param2: app.rive.runtime.kotlin, param3: app.rive.runtime.kotlin, param4: globalAndroid.graphics.RectF): globalAndroid.graphics.PointF;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static INSTANCE: app.rive.runtime.any;
+            public convertToArtboardSpace(param0: globalAndroid.graphics.RectF, param1: globalAndroid.graphics.PointF, param2: app.rive.runtime.any, param3: app.rive.runtime.any, param4: globalAndroid.graphics.RectF): globalAndroid.graphics.PointF;
+            public printStackTrace(): void;
           }
         }
       }
@@ -591,17 +779,22 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class LayerState extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public isExitState(): boolean;
+          export class LayerState extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public isAnimationState(): boolean;
-            public constructor(param0: number);
+            public release(): number;
             public isBlendState(): boolean;
             public isEntryState(): boolean;
-            public isBlendStateDirect(): boolean;
             public isAnyState(): boolean;
-            public isBlendState1D(): boolean;
             public toString(): string;
+            public getRefCount(): number;
+            public isExitState(): boolean;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public constructor(param0: number);
+            public isBlendStateDirect(): boolean;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public isBlendState1D(): boolean;
           }
         }
       }
@@ -614,31 +807,36 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class LinearAnimationInstance extends app.rive.runtime.kotlin implements app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public time(param0: number): void;
-            public getDuration(): number;
-            public apply(param0: number): boolean;
-            public getDirection(): app.rive.runtime.kotlin;
-            public getWorkStart(): number;
+          export class LinearAnimationInstance extends app.rive.runtime.any implements app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public getTime(): number;
             public getName(): string;
             public getWorkEnd(): number;
             public getStartTime(): number;
             public getEndTime(): number;
-            public apply(): void;
-            public getLoop(): app.rive.runtime.kotlin;
+            public getRefCount(): number;
             public cppDelete(param0: number): void;
-            public constructor(param0: number);
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
             public getEffectiveDurationInSeconds(): number;
-            public advance(param0: number): app.rive.runtime.kotlin;
-            public setLoop(param0: app.rive.runtime.kotlin): void;
-            public setDirection(param0: app.rive.runtime.kotlin): void;
+            public acquire(): number;
+            public advance(param0: number): app.rive.runtime.any;
+            public setLoop(param0: app.rive.runtime.any): void;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public setDirection(param0: app.rive.runtime.any): void;
             public getEffectiveDuration(): number;
             public constructor(param0: number, param1: number);
             public getFps(): number;
-            public getMix(): number;
             public setMix(param0: number): void;
+            public time(param0: number): void;
+            public getDuration(): number;
+            public apply(param0: number): boolean;
+            public release(): number;
+            public getDirection(): app.rive.runtime.any;
+            public getWorkStart(): number;
+            public apply(): void;
+            public getLoop(): app.rive.runtime.any;
+            public constructor(param0: number);
+            public getMix(): number;
           }
         }
       }
@@ -652,19 +850,18 @@ declare module app {
       export module kotlin {
         export module core {
           export class Loop {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static ONESHOT: app.rive.runtime.kotlin;
-            public static LOOP: app.rive.runtime.kotlin;
-            public static PINGPONG: app.rive.runtime.kotlin;
-            public static AUTO: app.rive.runtime.kotlin;
-            public static valueOf(param0: string): app.rive.runtime.kotlin;
-            public getValue(): number;
-            public static values(): androidNative.Array<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static ONESHOT: app.rive.runtime.any;
+            public static LOOP: app.rive.runtime.any;
+            public static PINGPONG: app.rive.runtime.any;
+            public static AUTO: app.rive.runtime.any;
+            public static valueOf(param0: string): app.rive.runtime.any;
+            public static values(): androidNative.Array<app.rive.runtime.any>;
           }
           export module Loop {
             export class Companion {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
-              public fromInt(param0: number): app.rive.runtime.kotlin;
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public fromIndex(param0: number): app.rive.runtime.any;
             }
           }
         }
@@ -678,20 +875,24 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export abstract class NativeObject {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export abstract class NativeObject extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public static NULL_POINTER: number;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public getDependencies(): java.util.List<app.rive.runtime.any>;
             public cppDelete(param0: number): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
             public getHasCppObject(): boolean;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public getCppPointer(): number;
-            public getDependencies(): java.util.List<app.rive.runtime.kotlin>;
             public setCppPointer(param0: number): void;
-            public dispose(): void;
           }
           export module NativeObject {
             export class Companion {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+              public static class: java.lang.Class<app.rive.runtime.any>;
             }
           }
         }
@@ -706,9 +907,9 @@ declare module app {
       export module kotlin {
         export module core {
           export class PlayableInstance {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            public static class: java.lang.Class<app.rive.runtime.any>;
             /**
-             * Constructs a new instance of the app.rive.runtime.kotlin interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+             * Constructs a new instance of the app.rive.runtime.any interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
              */
             public constructor(implementation: { getName(): string });
             public constructor();
@@ -720,17 +921,75 @@ declare module app {
   }
 }
 
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module core {
+          export class RefCount {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            /**
+             * Constructs a new instance of the app.rive.runtime.any interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+             */
+            public constructor(implementation: { getRefs(): java.util.concurrent.atomic.AtomicInteger; setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void; getRefCount(): number; acquire(): number; release(): number });
+            public constructor();
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+          }
+          export module RefCount {
+            export class DefaultImpls {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public static acquire(param0: app.rive.runtime.any): number;
+              public static release(param0: app.rive.runtime.any): number;
+              public static getRefCount(param0: app.rive.runtime.any): number;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module core {
+          export class RendererType {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static Skia: app.rive.runtime.any;
+            public static Rive: app.rive.runtime.any;
+            public static valueOf(param0: string): app.rive.runtime.any;
+            public static values(): androidNative.Array<app.rive.runtime.any>;
+            public getValue(): number;
+          }
+          export module RendererType {
+            export class Companion {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public fromIndex(param0: number): app.rive.runtime.any;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
         export module core {
           export class Rive {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static INSTANCE: app.rive.runtime.kotlin;
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static INSTANCE: app.rive.runtime.any;
             public initializeCppEnvironment(): void;
-            public init(param0: globalAndroid.content.Context): void;
-            public calculateRequiredBounds(param0: app.rive.runtime.kotlin, param1: app.rive.runtime.kotlin, param2: globalAndroid.graphics.RectF, param3: globalAndroid.graphics.RectF): globalAndroid.graphics.RectF;
+            public init(param0: globalAndroid.content.Context, param1: app.rive.runtime.any): void;
+            public getDefaultRendererType(): app.rive.runtime.any;
+            public calculateRequiredBounds(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: globalAndroid.graphics.RectF, param3: globalAndroid.graphics.RectF): globalAndroid.graphics.RectF;
           }
         }
       }
@@ -743,11 +1002,39 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class SMIBoolean extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class RiveTextValueRun extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setText(param0: string): void;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
+            public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public getText(): string;
+            public toString(): string;
+          }
+        }
+      }
+    }
+  }
+}
+
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module core {
+          export class SMIBoolean extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public setValue(param0: boolean): void;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
             public getValue(): boolean;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -761,10 +1048,15 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class SMIInput extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class SMIInput extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public isTrigger(): boolean;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public isBoolean(): boolean;
             public isNumber(): boolean;
             public getName(): string;
@@ -781,9 +1073,14 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class SMINumber extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class SMINumber extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public setValue(param0: number): void;
             public toString(): string;
             public getValue(): number;
@@ -799,10 +1096,15 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class SMITrigger extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class SMITrigger extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public release(): number;
             public constructor(param0: number);
+            public acquire(): number;
             public fire(): void;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
             public toString(): string;
           }
         }
@@ -816,23 +1118,28 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module core {
-          export class StateMachineInstance extends app.rive.runtime.kotlin implements app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export class StateMachineInstance extends app.rive.runtime.any implements app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
             public pointerUp(param0: number, param1: number): void;
             public getInputCount(): number;
-            public input(param0: string): app.rive.runtime.kotlin;
+            public release(): number;
+            public input(param0: string): app.rive.runtime.any;
             public pointerMove(param0: number, param1: number): void;
             public getInputNames(): java.util.List<string>;
             public advance(param0: number): boolean;
             public getName(): string;
             public getLayerCount(): number;
-            public getStatesChanged(): java.util.List<app.rive.runtime.kotlin>;
-            public stateChanged(param0: number): app.rive.runtime.kotlin;
+            public getStatesChanged(): java.util.List<app.rive.runtime.any>;
+            public getRefCount(): number;
+            public stateChanged(param0: number): app.rive.runtime.any;
             public cppDelete(param0: number): void;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
             public constructor(param0: number);
-            public getInputs(): java.util.List<app.rive.runtime.kotlin>;
+            public getInputs(): java.util.List<app.rive.runtime.any>;
             public pointerDown(param0: number, param1: number): void;
-            public input(param0: number): app.rive.runtime.kotlin;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public input(param0: number): app.rive.runtime.any;
           }
         }
       }
@@ -846,8 +1153,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class AnimationException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class AnimationException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -863,8 +1170,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class ArtboardException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class ArtboardException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -880,8 +1187,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class MalformedFileException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class MalformedFileException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -898,7 +1205,7 @@ declare module app {
         export module core {
           export module errors {
             export class RiveException {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -914,8 +1221,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class StateMachineException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class StateMachineException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -931,8 +1238,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class StateMachineInputException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class StateMachineInputException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -948,8 +1255,8 @@ declare module app {
       export module kotlin {
         export module core {
           export module errors {
-            export class UnsupportedRuntimeVersionException extends app.rive.runtime.kotlin {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+            export class TextValueRunException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
               public constructor(param0: string);
             }
           }
@@ -963,16 +1270,11 @@ declare module app {
   export module rive {
     export module runtime {
       export module kotlin {
-        export module renderers {
-          export class RendererMetrics {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
-            public static SAMPLES: number;
-            public constructor(param0: globalAndroid.app.Activity);
-            public onFrameMetricsAvailable(param0: globalAndroid.view.Window, param1: globalAndroid.view.FrameMetrics, param2: number): void;
-          }
-          export module RendererMetrics {
-            export class Companion {
-              public static class: java.lang.Class<app.rive.runtime.kotlin>;
+        export module core {
+          export module errors {
+            export class UnsupportedRuntimeVersionException extends app.rive.runtime.any {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+              public constructor(param0: string);
             }
           }
         }
@@ -986,30 +1288,78 @@ declare module app {
     export module runtime {
       export module kotlin {
         export module renderers {
-          export abstract class RendererSkia extends app.rive.runtime.kotlin {
-            public static class: java.lang.Class<app.rive.runtime.kotlin>;
+          export abstract class Renderer extends app.rive.runtime.any {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public delete(): void;
+            public isPlaying(): boolean;
+            public setSurface(param0: globalAndroid.view.Surface): void;
+            public doFrame(param0: number): void;
+            public getRefCount(): number;
+            public cppDelete(param0: number): void;
+            public isAttached(): boolean;
+            public setRefs(param0: java.util.concurrent.atomic.AtomicInteger): void;
+            public acquire(): number;
+            public getRefs(): java.util.concurrent.atomic.AtomicInteger;
+            public draw(): void;
+            public align(param0: app.rive.runtime.any, param1: app.rive.runtime.any, param2: globalAndroid.graphics.RectF, param3: globalAndroid.graphics.RectF): void;
+            public constructor(param0: app.rive.runtime.any, param1: boolean);
             public scheduleFrame(): void;
             public restore(): void;
             public constructor();
-            public delete(): void;
-            public isPlaying(): boolean;
+            public release(): number;
             public disposeDependencies(): void;
             public getHeight(): number;
-            public setSurface(param0: globalAndroid.view.Surface): void;
             public stop(): void;
             public advance(param0: number): void;
-            public doFrame(param0: number): void;
+            public getTrace(): boolean;
             public getWidth(): number;
             public make(): void;
             public start(): void;
             public getAverageFps(): number;
-            public cppDelete(param0: number): void;
             public constructor(param0: number);
             public stopThread$any_release(): void;
-            public constructor(param0: boolean);
+            public translate(param0: number, param1: number): void;
+            public scale(param0: number, param1: number): void;
             public save(): void;
-            public draw(): void;
-            public align(param0: app.rive.runtime.kotlin, param1: app.rive.runtime.kotlin, param2: globalAndroid.graphics.RectF, param3: globalAndroid.graphics.RectF): void;
+            public setAttached(param0: boolean): void;
+            public transform(param0: number, param1: number, param2: number, param3: number, param4: number, param5: number): void;
+          }
+        }
+      }
+    }
+  }
+}
+
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module renderers {
+          export class RendererMetrics {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public static SAMPLES: number;
+            public constructor(param0: globalAndroid.app.Activity);
+            public onFrameMetricsAvailable(param0: globalAndroid.view.Window, param1: globalAndroid.view.FrameMetrics, param2: number): void;
+          }
+          export module RendererMetrics {
+            export class Companion {
+              public static class: java.lang.Class<app.rive.runtime.any>;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+declare module app {
+  export module rive {
+    export module runtime {
+      export module kotlin {
+        export module renderers {
+          export abstract class RendererSkia {
+            public static class: java.lang.Class<app.rive.runtime.any>;
+            public constructor();
           }
         }
       }
@@ -1019,4 +1369,3 @@ declare module app {
 
 //Generics information:
 //app.rive.runtime.kotlin.Observable:1
-//app.rive.runtime.kotlin.controllers.RiveController:1
diff --git a/tools/assets/App_Resources/Android/app.gradle b/tools/assets/App_Resources/Android/app.gradle
index c53709e..d989e52 100644
--- a/tools/assets/App_Resources/Android/app.gradle
+++ b/tools/assets/App_Resources/Android/app.gradle
@@ -1,3 +1,10 @@
+dependencies {
+    constraints {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" 
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21"
+    }
+}
+
 android {
   compileSdkVersion 33
   buildToolsVersion "33.0.0"
@@ -17,4 +24,25 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+  kotlinOptions {
+      jvmTarget = '1.8'
+  }
+  packagingOptions {
+    pickFirst 'lib/armeabi-v7a/libRSSupport.so'
+    pickFirst 'lib/arm64-v8a/libRSSupport.so'
+    pickFirst 'lib/x86_64/libRSSupport.so'
+    pickFirst 'lib/x86/libRSSupport.so'
+    pickFirst 'lib/armeabi-v7a/librsjni.so'
+    pickFirst 'lib/arm64-v8a/librsjni.so'
+    pickFirst 'lib/x86_64/librsjni.so'
+    pickFirst 'lib/x86/librsjni.so'
+    pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    pickFirst 'lib/arm64-v8a/libc++_shared.so'
+    pickFirst 'lib/x86_64/libc++_shared.so'
+    pickFirst 'lib/x86/libc++_shared.so'
+    pickFirst 'lib/armeabi-v7a/librsjni_androidx.so'
+    pickFirst 'lib/arm64-v8a/librsjni_androidx.so'
+    pickFirst 'lib/x86_64/librsjni_androidx.so'
+    pickFirst 'lib/x86/librsjni_androidx.so'
+  }
 }
diff --git a/tools/assets/App_Resources/Android/gradle.properties b/tools/assets/App_Resources/Android/gradle.properties
new file mode 100644
index 0000000..55c5b25
--- /dev/null
+++ b/tools/assets/App_Resources/Android/gradle.properties
@@ -0,0 +1 @@
+useKotlin=true
\ No newline at end of file
diff --git a/tools/assets/App_Resources/Android/src/main/java/BasicView.kt b/tools/assets/App_Resources/Android/src/main/java/BasicView.ktOFF
similarity index 100%
rename from tools/assets/App_Resources/Android/src/main/java/BasicView.kt
rename to tools/assets/App_Resources/Android/src/main/java/BasicView.ktOFF
diff --git a/tools/assets/App_Resources/Android/src/main/java/ColorPicker.kt b/tools/assets/App_Resources/Android/src/main/java/ColorPicker.ktOFF
similarity index 100%
rename from tools/assets/App_Resources/Android/src/main/java/ColorPicker.kt
rename to tools/assets/App_Resources/Android/src/main/java/ColorPicker.ktOFF
diff --git a/tools/assets/App_Resources/Android/src/main/java/FlyingHearts.kt b/tools/assets/App_Resources/Android/src/main/java/FlyingHearts.ktOFF
similarity index 100%
rename from tools/assets/App_Resources/Android/src/main/java/FlyingHearts.kt
rename to tools/assets/App_Resources/Android/src/main/java/FlyingHearts.ktOFF
diff --git a/tools/demo/index.ts b/tools/demo/index.ts
index 1288ca0..f757516 100644
--- a/tools/demo/index.ts
+++ b/tools/demo/index.ts
@@ -1,7 +1,2 @@
 export * from './utils';
-export * from './flutter';
-export * from './ionic-portals';
-export * from './jetpack-compose';
 export * from './rive';
-export * from './swift-ui';
-export * from './ui-charts';

From 812d69a5880c1e1dc72bfc93eb5db71b93f61fb9 Mon Sep 17 00:00:00 2001
From: Osei Fortune <fortune.osei@yahoo.com>
Date: Sun, 13 Aug 2023 02:27:25 -0400
Subject: [PATCH 2/2] fix(android): rive

---
 packages/rive/index.android.ts                | 44 ++++++++++---------
 .../rive/platforms/android/include.gradle     |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/rive/index.android.ts b/packages/rive/index.android.ts
index bd89c08..a67a74e 100644
--- a/packages/rive/index.android.ts
+++ b/packages/rive/index.android.ts
@@ -9,33 +9,40 @@ function lazy<T>(action: () => T): () => T {
 }
 
 @NativeClass()
-@Interfaces([app.rive.runtime.kotlin.RiveArtboardRenderer.Listener])
-class Listener extends java.lang.Object implements app.rive.runtime.kotlin.RiveArtboardRenderer.Listener {
-  owner: RiveView;
+@Interfaces([app.rive.runtime.kotlin.controllers.RiveFileController.Listener])
+class Listener extends java.lang.Object implements app.rive.runtime.kotlin.controllers.RiveFileController.Listener {
+  owner: WeakRef<RiveView>;
 
-  constructor(owner: RiveView) {
+  constructor(owner: WeakRef<RiveView>) {
     super();
     this.owner = owner;
+    return global.__native(this);
+  }
+  public notifyAdvance(param0: number): void {
+    // todo
   }
 
   notifyPlay(animation: app.rive.runtime.kotlin.core.PlayableInstance): void {
-    this.owner.events.notifyEvent(RiveEvents.onPlayEvent, { name: animation.getName() });
+    // this.owner.get()?.events.notifyEvent(RiveEvents.onPlayEvent, { name: animation.getName() });
   }
 
   notifyStop(animation: app.rive.runtime.kotlin.core.PlayableInstance): void {
-    this.owner.events.notifyEvent(RiveEvents.onStopEvent, { name: animation.getName() });
+    // this.owner.get()?.events.notifyEvent(RiveEvents.onStopEvent, { name: animation.getName() });
   }
 
   notifyPause(animation: app.rive.runtime.kotlin.core.PlayableInstance): void {
-    this.owner.events.notifyEvent(RiveEvents.onPauseEvent, { name: animation.getName() });
+    // this.owner.get()?.events.notifyEvent(RiveEvents.onPauseEvent, { name: animation.getName() });
   }
 
   notifyLoop(animation: app.rive.runtime.kotlin.core.PlayableInstance): void {
-    this.owner.events.notifyEvent(RiveEvents.onLoopEndEvent, { name: animation.getName(), loop: this.owner.loop });
+    const owner = this.owner.get();
+    if (owner) {
+      //  owner.events.notifyEvent(RiveEvents.onLoopEndEvent, { name: animation.getName(), loop: owner.loop });
+    }
   }
 
   notifyStateChanged(stateMachine: string, stateName: string): void {
-    this.owner.events.notifyEvent(RiveEvents.stateChangedEvent, { stateMachine, stateName });
+    // this.owner.get()?.events.notifyEvent(RiveEvents.stateChangedEvent, { stateMachine, stateName });
   }
 }
 
@@ -47,8 +54,6 @@ export class RiveView extends RiveViewBase {
 
   constructor() {
     super();
-    console.log('here?');
-    console.log('app.rive.runtime.kotlin.RiveAnimationView:', app.rive.runtime.kotlin.RiveAnimationView);
     this.events = new RiveEvents(this);
   }
 
@@ -71,7 +76,7 @@ export class RiveView extends RiveViewBase {
       if (!/.(riv)$/.test(src)) {
         src += '.riv';
       }
-      const filename = src.replace(/^.*[\\\/]/, '');
+      const filename = src.replace(/^.*[\\/]/, '');
       const folder = knownFolders.currentApp().getFolder(src.substring(2).replace(filename, ''));
       const file: File = folder.getFile(filename);
       this.bytes = await file.read();
@@ -138,9 +143,7 @@ export class RiveView extends RiveViewBase {
 
   private _setInputValue(name: string, value: string | boolean | number | null) {
     this.input = name;
-    if (this.input) {
-      console.log('typeof value:', typeof value);
-      console.log('inputValue:', value);
+    if (this.input && this.stateMachine && this.input) {
       if (Utils.isBoolean(value) || ['true', 'false'].includes(value as string)) {
         this.nativeViewProtected.setBooleanState(this.stateMachine, this.input, value === true || value === 'true');
       } else {
@@ -244,15 +247,14 @@ export class RiveView extends RiveViewBase {
 
   private addListener() {
     if (!this.listener) {
-      this.listener = new Listener(this);
-      this.nativeViewProtected.registerListener(this.listener);
+      this.listener = new Listener(new WeakRef(this));
+      // todo investigate.
+      //this.nativeViewProtected.getController().registerListener(this.listener);
     }
   }
 
-  private buildList(array: string[]): java.util.ArrayList<any> {
-    const animations = new java.util.ArrayList();
-    array.forEach((item) => animations.add(item));
-    return animations;
+  private buildList(array: string[]): java.util.List<any> {
+    return java.util.Arrays.asList(array);
   }
 
   private getLoop(riveLoop: TypeRiveLoop): app.rive.runtime.kotlin.core.Loop {
diff --git a/packages/rive/platforms/android/include.gradle b/packages/rive/platforms/android/include.gradle
index 1d73043..a5632ab 100644
--- a/packages/rive/platforms/android/include.gradle
+++ b/packages/rive/platforms/android/include.gradle
@@ -2,7 +2,7 @@ dependencies {
 	def androidXAppCompatVersion =  project.hasProperty("androidXAppCompat") ? project.androidXAppCompat : "1.3.1"
 	implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
 
-	def riveVersion =  project.hasProperty("riveVersion") ? project.riveVersion : "8.1.+"
+	def riveVersion =  project.hasProperty("riveVersion") ? project.riveVersion : "8.2.0"
 	implementation "app.rive:rive-android:$riveVersion"
     implementation "androidx.startup:startup-runtime:1.1.1"
 }