Skip to content

Commit

Permalink
Version Update
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacakakpo1 committed Mar 11, 2024
1 parent ffb10d5 commit 9799760
Show file tree
Hide file tree
Showing 21 changed files with 171 additions and 199 deletions.
14 changes: 3 additions & 11 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ android {
versionCode = 1
versionName = "1.0"
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}


packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand All @@ -40,9 +36,5 @@ android {

dependencies {
implementation(projects.shared)
implementation(libs.compose.ui)
implementation(libs.compose.ui.tooling.preview)
implementation(libs.compose.material3)
implementation(libs.androidx.activity.compose)
debugImplementation(libs.compose.ui.tooling)

}
9 changes: 1 addition & 8 deletions androidApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@
android:allowBackup="false"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,40 +1,7 @@
package com.telnyx.janusmessagesdk.android

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.telnyx.janusmessagesdk.Greeting

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
MyApplicationTheme {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
GreetingView(Greeting().greet())
}
}
}
}
}

@Composable
fun GreetingView(text: String) {
Text(text = text)
}

@Preview
@Composable
fun DefaultPreview() {
MyApplicationTheme {
GreetingView("Hello, Android!")
}
}

This file was deleted.

12 changes: 1 addition & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
[versions]
agp = "8.1.0"
kotlin = "1.9.10"
compose = "1.5.1"
compose-compiler = "1.5.3"
compose-material3 = "1.1.2"
androidx-activityCompose = "1.7.2"
kotlin = "1.9.20"
kotlinxDatetime = "0.5.0"
kotlinxSerializationJson = "1.6.0"
ktorVersion = "2.3.7"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktorVersion" }
Expand Down
4 changes: 2 additions & 2 deletions iosApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
target 'iosApp' do
use_frameworks!
platform :ios, '14.1'
pod 'JanusMessageSDK', '0.7.20'
end
pod 'JanusMessageSDK', :path => '../shared'
end
14 changes: 7 additions & 7 deletions iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- JanusMessageSDK (0.7.20)
- JanusMessageSDK (0.7.24)

DEPENDENCIES:
- JanusMessageSDK (= 0.7.20)
- JanusMessageSDK (from `../shared`)

SPEC REPOS:
trunk:
- JanusMessageSDK
EXTERNAL SOURCES:
JanusMessageSDK:
:path: "../shared"

SPEC CHECKSUMS:
JanusMessageSDK: c85bdd5d7d482d34a05dfb90be1c1caa98a10805
JanusMessageSDK: e76862260037deafcfdfb13f6ac5b07754fd1de5

PODFILE CHECKSUM: 90a9949468aca7f7507558aec9e95a8d60ae04af
PODFILE CHECKSUM: f49c83502265f613b705206e564445714899ea9d

COCOAPODS: 1.14.3
14 changes: 7 additions & 7 deletions iosApp/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9799760

Please sign in to comment.