Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Ktx Sample App Updates #698

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Ktx Sample App Updates #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5a2373
Update build.gradle
Funkatronics Jan 29, 2024
a2bb5e7
Update build.gradle
Funkatronics Jan 29, 2024
6550868
Update gradle-wrapper.properties
Funkatronics Jan 29, 2024
85b4bec
Update gradle.properties
Funkatronics Jan 29, 2024
6187056
Update AndroidManifest.xml
Funkatronics Jan 29, 2024
4b36e2c
add namespace
Funkatronics Jan 29, 2024
4f06d95
android plugins
Funkatronics Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions examples/example-clientlib-ktx-app/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ plugins {
}

android {
compileSdk 33
compileSdk 34
namespace 'com.solanamobile.ktxclientsample'

defaultConfig {
applicationId "com.solanamobile.ktxclientsample"
minSdk 27
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -66,17 +67,17 @@ android {
dependencies {
implementation project(path: ':clientlib-ktx')

implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation "androidx.compose.runtime:runtime:$compose_version"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation "androidx.compose.material:material:$compose_material_version"
implementation "androidx.compose.material:material-icons-core:$compose_material_version"
implementation "androidx.compose.material:material-icons-extended:$compose_material_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0'
implementation 'androidx.activity:activity-compose:1.5.0'
implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'
implementation 'androidx.activity:activity-compose:1.8.2'
implementation "androidx.hilt:hilt-navigation-compose:1.1.0"

implementation "com.google.dagger:hilt-android:2.50"
kapt "com.google.dagger:hilt-compiler:2.50"
Expand All @@ -87,10 +88,10 @@ dependencies {

testImplementation 'junit:junit:4.13.2'

androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"

debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
}
}
5 changes: 2 additions & 3 deletions examples/example-clientlib-ktx-app/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.solanamobile.ktxclientsample">
xmlns:tools="http://schemas.android.com/tools">

<application
android:name=".KtxClientSampleApp"
Expand All @@ -28,4 +27,4 @@
</activity>
</application>

</manifest>
</manifest>
8 changes: 4 additions & 4 deletions examples/example-clientlib-ktx-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext {
compose_version = '1.3.3'
compose_material_version = '1.3.1'
compose_version = '1.6.0'
compose_material_version = '1.6.0'
compose_compiler_version = '1.5.8'
}

Expand All @@ -11,8 +11,8 @@ buildscript {
}

plugins {
id 'com.android.application' version '7.2.2' apply false
id 'com.android.library' version '7.2.2' apply false
id 'com.android.application' version '8.2.0' apply false
id 'com.android.library' version '8.2.0' apply false
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
}

Expand Down
4 changes: 3 additions & 1 deletion examples/example-clientlib-ktx-app/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion examples/example-clientlib-ktx-app/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jul 15 08:42:29 PDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME