Skip to content

Commit

Permalink
Fix build but removed some code
Browse files Browse the repository at this point in the history
  • Loading branch information
cl3m committed Mar 16, 2022
1 parent 5462508 commit d9236ff
Show file tree
Hide file tree
Showing 143 changed files with 689 additions and 2,028 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Kotlin Multiplatform](https://img.shields.io/static/v1?logo=Kotlin&&logoColor=3c94cf&label=&message=Kotlin%20Multiplatform&color=555)](https://kotlinlang.org/docs/reference/multiplatform.html)

:warning: This PoC is currently not functional. Compose changed too much from beta and broke many things. I will update it using the compose compiler when it will be possible. There are some hope on the way :
:warning: This PoC compile on iOS and Android but I've remove some functionality because Compose changed too much since I started it. I will update it using the compose compiler when it will be possible. There are some hope on the way :
- [Compose Multiplatform by JetBrains](https://github.com/JetBrains/compose-jb) started native support via Skia ([Skiko](https://github.com/JetBrains/skiko)), you can have a look at the [sample](https://github.com/JetBrains/compose-jb/tree/master/experimental/examples/falling-balls-mpp) but it is still very early. Some of the demos in this repo works but there is still many broken functionality. It will use the compose compiler but not native component.
- [Platform-Kit by IceRock](https://github.com/Alex009/compose-jb/tree/platform-kit-sample/examples/common-platform-uikit) based on Compose Multiplatform by JetBrains, add support via UIKit, thus use the compose compiler and native iOS component.
- [Redwood Compose](https://jakewharton.com/multiplatform-compose-and-gradle-module-metadata-abuse/) by Cash App (not released yet). Use the compose compiler and native iOS component.
Expand Down
2 changes: 0 additions & 2 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ android {
}
kotlinOptions {
jvmTarget = "1.8"
useIR = true
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerVersion = Version.kotlin
kotlinCompilerExtensionVersion = Version.compose
}
}
Expand Down
2 changes: 1 addition & 1 deletion androidApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:allowBackup="false"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity" android:theme="@style/Theme.Design.NoActionBar">
<activity android:name=".MainActivity" android:theme="@style/Theme.Design.NoActionBar" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
classpath("com.android.tools.build:gradle:7.0.0-alpha04")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Version.kotlin}")
classpath("com.android.tools.build:gradle:7.1.2")
}
}

Expand Down
16 changes: 8 additions & 8 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@

object Version {
const val kotlin = "1.4.21"
const val kotlin = "1.6.10"

const val appcompat = "1.2.0"
const val material = "1.2.1"
const val appcompat = "1.4.0"
const val material = "1.4.0"

const val compose = "1.0.0-alpha09"
const val nav_compose = "1.0.0-alpha04"
const val compose = "1.1.0"
const val nav_compose = "2.4.1"

const val yoga = "~> 1.7"

const val junit = "4.13"

const val coil = "1.1.1"
const val coroutines = "1.4.2"
const val coil = "1.4.0"
const val coroutines = "1.5.2"
}


object AndroidSdk {
const val min = 24
const val compile = 29
const val compile = 31
const val target = compile
}

Expand Down
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 @@
#Fri Jan 22 09:15:46 CET 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
4 changes: 4 additions & 0 deletions iosApp/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ target 'iosApp' do

end

# See https://stackoverflow.com/questions/37160688/set-deployment-target-for-cocoapodss-pod/51416359#51416359
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
# Force CocoaPods targets to always build for x86_64
config.build_settings['ARCHS[sdk=iphonesimulator*]'] = 'x86_64'
end
end
end

6 changes: 3 additions & 3 deletions iosApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ EXTERNAL SOURCES:
:path: "../test"

SPEC CHECKSUMS:
test: fc4bac006dbcc16c5317efb7a92e4d063a28d169
test: 72859298f3559094e4087550d7dc622688572e28
Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 9a6cae4b13ea55407e3d7c97432125b82a015dfb
PODFILE CHECKSUM: 7550d818c61fa360b8651061baef62b99f2fe5b7

COCOAPODS: 1.10.0
COCOAPODS: 1.11.2
12 changes: 3 additions & 9 deletions iosApp/Pods/Local Podspecs/test.podspec.json

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

6 changes: 3 additions & 3 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 d9236ff

Please sign in to comment.