Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
defaultConfig {
applicationId "com.wajahatkarim.flippable_demo"
minSdk 21
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"

Expand All @@ -26,43 +26,44 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '19'
jvmTarget = '17'
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion composeVersion
kotlinCompilerExtensionVersion composeKotlinCompilerExtensionVersion
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
namespace 'com.wajahatkarim.flippable_demo'
}

dependencies {
// Android
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
implementation "androidx.core:core-ktx:$androidCoreVersion"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'

// Compose
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material:material:$composeVersion"
implementation "androidx.compose.ui:ui-tooling-preview:$composeVersion"
implementation 'androidx.activity:activity-compose:1.4.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0"
implementation 'androidx.activity:activity-compose:1.8.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
debugImplementation "androidx.compose.ui:ui-tooling:$composeVersion"

implementation project(":flippable")

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
testImplementation "junit:junit:$jUnitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidJUnitTestVersion"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$composeVersion"
}
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.wajahatkarim.flippable_demo">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
16 changes: 7 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
buildscript {
ext {
agpVersion = '7.4.2'
kotlinVersion = '1.9.20'
agpVersion = '8.2.2'
kotlinVersion = '1.9.22'
dokkaKotlinVersion = '1.9.10'
coroutinesVersion = '1.5.4'
androidCoreVersion = '1.7.0'
composeVersion = '1.5.4'
androidCoreVersion = '1.12.0'
composeVersion = '1.6.0'
jUnitVersion = '4.13.2'
composeKotlinCompilerExtensionVersion = '1.5.4'
androidJUnitTestVersion = '1.1.3'
spotlessVersion = '6.2.2'
mavenPublishVersion = '0.18.0'
composeKotlinCompilerExtensionVersion = '1.5.8'
androidJUnitTestVersion = '1.1.5'
mavenPublishVersion = '0.27.0'
}
repositories {
google()
Expand Down
9 changes: 8 additions & 1 deletion flippable/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace 'com.wajahatkarim.flippable'
compileSdk 31
compileSdk 34

defaultConfig {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -19,6 +19,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
buildFeatures {
buildConfig false
compose true
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ 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.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Feb 13 21:06:09 PKT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME