Skip to content

Commit

Permalink
update to 0.8.0 (#15)
Browse files Browse the repository at this point in the history
* update to 0.8.0
  • Loading branch information
nhachicha authored Dec 21, 2021
1 parent 124840d commit fefa735
Show file tree
Hide file tree
Showing 58 changed files with 1,465 additions and 1,075 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,22 @@ jobs:
working-directory: ./Intro
run: |
chmod +x gradlew
./gradlew buildDebug packForXcode
./gradlew buildDebug
- name: Building Bookshelf [Debug]
working-directory: ./Bookshelf
run: |
chmod +x gradlew
./gradlew buildDebug packForXcode
./gradlew buildDebug
- name: Building KMP Demo
working-directory: ./MultiplatformDemo
run: |
chmod +x gradlew
./gradlew assemble
./gradlew assemble
- name: JVM Console
working-directory: ./JVMConsole
run: |
chmod +x gradlew
./gradlew jar
17 changes: 17 additions & 0 deletions Bookshelf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ The UI part 🎨 is platform specific:
- 🤖 Android: Jetpack compose
- 🍏 iOS: SwiftUI

## Requirements

- JDK 11
- Android Studio [Bumblebee (2021.1.1) Beta 5](https://developer.android.com/studio/preview)
- NOTE: The SDK doesn't currently support `x86` - Please use an `x86_64` or `arm64` emulator/device

## Limitation

- This doesn't run on a M1 device for now until Ktor client (libcurl) supports [macos_arm64](https://youtrack.jetbrains.com/issue/KTOR-3248)

## Screenshots:

### Android
Expand All @@ -20,3 +30,10 @@ The UI part 🎨 is platform specific:
<img src="./Screenshots/iOS/Search_Pending.png" width="400" > <img src="./Screenshots/iOS/Search.png" width="400">
<img src="./Screenshots/iOS/Saved.png" width="400" > <img src="./Screenshots/iOS/SavedBooks.png" width="400" >
<img src="./Screenshots/iOS/About.png" width="400" >

Run using Cocoapods:
```
cd iosApp
pod install
open iosApp.xcworkspace
```
19 changes: 8 additions & 11 deletions Bookshelf/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
kotlin("android")
}

val compose_version = "1.0.4"
val compose_version = "1.1.0-rc01"

repositories {
google()
Expand All @@ -12,22 +12,21 @@ repositories {

dependencies {
implementation(project(":shared"))
implementation("androidx.constraintlayout:constraintlayout:2.1.1")
implementation("androidx.constraintlayout:constraintlayout:2.1.2")
implementation("androidx.compose.compiler:compiler:$compose_version")
compileOnly("io.realm.kotlin:library:0.4.1")

implementation("androidx.core:core-ktx:1.6.0")
implementation("androidx.appcompat:appcompat:1.3.1")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.0")
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.compose.ui:ui:$compose_version")
implementation("androidx.compose.material:material:$compose_version")
implementation("androidx.compose.ui:ui-tooling:$compose_version")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
implementation("androidx.activity:activity-compose:1.4.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
implementation("androidx.activity:activity-compose:1.4.0")
implementation("androidx.navigation:navigation-runtime-ktx:2.3.5")
implementation("androidx.navigation:navigation-compose:2.4.0-alpha10")
implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01")
implementation("androidx.navigation:navigation-compose:2.4.0-rc01")
implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0")
}

android {
Expand Down Expand Up @@ -71,11 +70,9 @@ android {

kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
}

composeOptions {
kotlinCompilerVersion = "1.5.10"
kotlinCompilerExtensionVersion = compose_version
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class MainActivity : ComponentActivity() {

private val bookshelfViewModel by viewModels<BookshelfViewModel>()

@ExperimentalComposeUiApi
@OptIn(ExperimentalComposeUiApi::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
Expand Down
9 changes: 4 additions & 5 deletions Bookshelf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
classpath("com.android.tools.build:gradle:7.1.0-alpha02")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
classpath("com.android.tools.build:gradle:7.1.0-beta05")
}
}

Expand All @@ -15,11 +15,10 @@ allprojects {
google()
mavenCentral()
}
group = "io.realm.sample.bookshelf"
version = "0.8.0"
}

group = "io.realm.sample.bookshelf"
version = "0.6.0"

tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}
2 changes: 1 addition & 1 deletion Bookshelf/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.2-all.zip
5 changes: 5 additions & 0 deletions Bookshelf/iosApp/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
target 'iosApp' do
use_frameworks!
platform :ios, '14.1'
pod 'shared', :path => '../shared'
end
16 changes: 16 additions & 0 deletions Bookshelf/iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- shared (0.8.0)

DEPENDENCIES:
- shared (from `../shared`)

EXTERNAL SOURCES:
shared:
:path: "../shared"

SPEC CHECKSUMS:
shared: 435401ceb57c44f421fd509682a959ce28f70dd8

PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

COCOAPODS: 1.11.2
31 changes: 31 additions & 0 deletions Bookshelf/iosApp/Pods/Local Podspecs/shared.podspec.json

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

16 changes: 16 additions & 0 deletions Bookshelf/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 fefa735

Please sign in to comment.