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

Upgrade to Kotlin 2.0.21 #654

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Upgrade to Kotlin 2.0.21 #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6c6310
Simple version bump
robbiehanson Nov 18, 2024
22979d5
Patch: Remove Tor library so project can be compiled on Apple Silicon…
robbiehanson Nov 18, 2024
99ee89b
(ios) Remove script copying shared framework to derived data
robbiehanson Nov 18, 2024
2131996
(ios) Adding build script to fix duplicated framework
robbiehanson Nov 18, 2024
4a1b2f8
(ios) Direct integration technique
robbiehanson Sep 26, 2024
d17a751
(android) Migrate to compose compiler gradle plugin
dpad85 Nov 18, 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
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
object Versions {
const val lightningKmp = "1.8.4"
const val secp256k1 = "0.14.0"
const val torMobile = "0.2.0"

const val kotlin = "1.9.22"
const val kotlin = "2.0.21"

const val ktor = "2.3.7"
const val sqlDelight = "2.0.1"
Expand All @@ -19,7 +18,6 @@ object Versions {
const val prefs = "1.2.0"
const val datastore = "1.0.0"
const val compose = "1.6.8"
const val composeCompiler = "1.5.8"
const val navCompose = "2.6.0"
const val accompanist = "0.30.1"
const val composeConstraintLayout = "1.1.0-alpha09"
Expand Down
5 changes: 1 addition & 4 deletions phoenix-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
kotlin("android")
id("com.google.gms.google-services")
id("kotlinx-serialization")
id("org.jetbrains.kotlin.plugin.compose") version Versions.kotlin
}

fun gitCommitHash(): String {
Expand Down Expand Up @@ -71,10 +72,6 @@ android {
dataBinding = true
}

composeOptions {
kotlinCompilerExtensionVersion = Versions.Android.composeCompiler
}

packagingOptions {
resources.merges.add("reference.conf")
}
Expand Down
148 changes: 5 additions & 143 deletions phoenix-ios/phoenix-ios.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@
DCAEF8F5276131A600015993 /* CheckboxToggleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAEF8F4276131A600015993 /* CheckboxToggleStyle.swift */; };
DCAEF8F727628BEB00015993 /* Either.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAEF8F627628BEB00015993 /* Either.swift */; };
DCB04685260D162C007FDA37 /* ViewName.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB04684260D162C007FDA37 /* ViewName.swift */; };
DCB0DB8A255AE42F005B29C8 /* PhoenixShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCB0DB83255AE42F005B29C8 /* PhoenixShared.framework */; };
DCB0DBB1255AEE22005B29C8 /* PhoenixShared.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DCB0DB83255AE42F005B29C8 /* PhoenixShared.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DCB30E522A0A948000E7D7A2 /* WalletInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB30E512A0A948000E7D7A2 /* WalletInfoView.swift */; };
DCB30E542A0AABAF00E7D7A2 /* InfoPopoverWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB30E532A0AABAF00E7D7A2 /* InfoPopoverWindow.swift */; };
DCB30E592A0C3F8200E7D7A2 /* LiquidityPolicyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB30E582A0C3F8200E7D7A2 /* LiquidityPolicyView.swift */; };
Expand Down Expand Up @@ -371,20 +369,6 @@
remoteGlobalIDString = 7555FF7A242A565900829871;
remoteInfo = "phoenix-ios";
};
DC641C682820786600862DCD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7555FF73242A565900829871 /* Project object */;
proxyType = 1;
remoteGlobalIDString = DCB0DB82255AE42F005B29C8;
remoteInfo = "phoenix-ios-framework";
};
DCB0DBAF255AEE0E005B29C8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7555FF73242A565900829871 /* Project object */;
proxyType = 1;
remoteGlobalIDString = DCB0DB82255AE42F005B29C8;
remoteInfo = "phoenix-ios-framework";
};
DCB511CC281AED58001BC525 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 7555FF73242A565900829871 /* Project object */;
Expand Down Expand Up @@ -412,7 +396,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
DCB0DBB1255AEE22005B29C8 /* PhoenixShared.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -656,7 +639,6 @@
DCAEF8F4276131A600015993 /* CheckboxToggleStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxToggleStyle.swift; sourceTree = "<group>"; };
DCAEF8F627628BEB00015993 /* Either.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Either.swift; sourceTree = "<group>"; };
DCB04684260D162C007FDA37 /* ViewName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewName.swift; sourceTree = "<group>"; };
DCB0DB83255AE42F005B29C8 /* PhoenixShared.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PhoenixShared.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DCB30E512A0A948000E7D7A2 /* WalletInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletInfoView.swift; sourceTree = "<group>"; };
DCB30E532A0AABAF00E7D7A2 /* InfoPopoverWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoPopoverWindow.swift; sourceTree = "<group>"; };
DCB30E582A0C3F8200E7D7A2 /* LiquidityPolicyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiquidityPolicyView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -752,7 +734,6 @@
DC39D4E5286B4A7E0030F18D /* Popovers in Frameworks */,
DCC46F1625C3521C005D32D9 /* FirebaseMessaging in Frameworks */,
DCCFE6AB2B6430AB002FFF11 /* Logging in Frameworks */,
DCB0DB8A255AE42F005B29C8 /* PhoenixShared.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -894,7 +875,6 @@
7555FF7B242A565900829871 /* Phoenix.app */,
7555FF91242A565B00829871 /* phoenix-iosTests.xctest */,
7555FF9C242A565B00829871 /* phoenix-iosUITests.xctest */,
DCB0DB83255AE42F005B29C8 /* PhoenixShared.framework */,
DCB511C7281AED58001BC525 /* phoenix-notifySrvExt.appex */,
);
name = Products;
Expand Down Expand Up @@ -1551,6 +1531,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "phoenix-ios" */;
buildPhases = (
DCA538EB2CA5AE7700B17C8B /* ShellScript */,
7555FF77242A565900829871 /* Sources */,
7555FF78242A565900829871 /* Frameworks */,
7555FF79242A565900829871 /* Resources */,
Expand All @@ -1560,7 +1541,6 @@
buildRules = (
);
dependencies = (
DCB0DBB0255AEE0E005B29C8 /* PBXTargetDependency */,
DCB511CD281AED58001BC525 /* PBXTargetDependency */,
);
name = "phoenix-ios";
Expand Down Expand Up @@ -1613,38 +1593,18 @@
productReference = 7555FF9C242A565B00829871 /* phoenix-iosUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
DCB0DB82255AE42F005B29C8 /* phoenix-ios-framework */ = {
isa = PBXNativeTarget;
buildConfigurationList = DCB0DB8C255AE42F005B29C8 /* Build configuration list for PBXNativeTarget "phoenix-ios-framework" */;
buildPhases = (
DCB0DB95255AE43E005B29C8 /* ShellScript */,
DCB0DB9F255AE6F1005B29C8 /* ShellScript */,
);
buildRules = (
);
dependencies = (
);
name = "phoenix-ios-framework";
packageProductDependencies = (
DCA5391829F1DAA3001BD3D5 /* SegmentedPicker */,
DC26D0B92A93BA8C006763B3 /* EffectsLibrary */,
);
productName = "phoenix-ios-framework";
productReference = DCB0DB83255AE42F005B29C8 /* PhoenixShared.framework */;
productType = "com.apple.product-type.framework";
};
DCB511C6281AED58001BC525 /* phoenix-notifySrvExt */ = {
isa = PBXNativeTarget;
buildConfigurationList = DCB511CF281AED58001BC525 /* Build configuration list for PBXNativeTarget "phoenix-notifySrvExt" */;
buildPhases = (
DCA538EC2CA5AF2A00B17C8B /* ShellScript */,
DCB511C3281AED58001BC525 /* Sources */,
DCB511C4281AED58001BC525 /* Frameworks */,
DCB511C5281AED58001BC525 /* Resources */,
);
buildRules = (
);
dependencies = (
DC641C692820786600862DCD /* PBXTargetDependency */,
);
name = "phoenix-notifySrvExt";
packageProductDependencies = (
Expand Down Expand Up @@ -1676,9 +1636,6 @@
CreatedOnToolsVersion = 11.3.1;
TestTargetID = 7555FF7A242A565900829871;
};
DCB0DB82255AE42F005B29C8 = {
CreatedOnToolsVersion = 12.1;
};
DCB511C6281AED58001BC525 = {
CreatedOnToolsVersion = 13.3;
};
Expand Down Expand Up @@ -1711,7 +1668,6 @@
projectDirPath = "";
projectRoot = "";
targets = (
DCB0DB82255AE42F005B29C8 /* phoenix-ios-framework */,
7555FF7A242A565900829871 /* phoenix-ios */,
7555FF90242A565B00829871 /* phoenix-iosTests */,
7555FF9B242A565B00829871 /* phoenix-iosUITests */,
Expand Down Expand Up @@ -1765,9 +1721,8 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
DCB0DB95255AE43E005B29C8 /* ShellScript */ = {
DCA538EB2CA5AE7700B17C8B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -1778,33 +1733,27 @@
outputFileListPaths = (
);
outputPaths = (
"$SRCROOT/../phoenix-shared/build/xcode-frameworks/$CONFIGURATION/$SDK_NAME/PhoenixShared.framework",
"$SRCROOT/../phoenix-shared/build/xcode-frameworks/$CONFIGURATION/$SDK_NAME/PhoenixShared.framework.dSYM",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd \"$SRCROOT/..\"\necho ./gradlew embedAndSignAppleFrameworkForXcode\n./gradlew embedAndSignAppleFrameworkForXcode\n";
};
DCB0DB9F255AE6F1005B29C8 /* ShellScript */ = {
DCA538EC2CA5AF2A00B17C8B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$SRCROOT/../phoenix-shared/build/xcode-frameworks/$CONFIGURATION/$SDK_NAME/PhoenixShared.framework",
"$SRCROOT/../phoenix-shared/build/xcode-frameworks/$CONFIGURATION/$SDK_NAME/PhoenixShared.framework.dSYM",
);
outputFileListPaths = (
);
outputPaths = (
$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/PhoenixShared.framework,
$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME/PhoenixShared.framework.dSYM,
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "SrcFrmk=\"$SRCROOT/../phoenix-shared/build/xcode-frameworks/$CONFIGURATION/$SDK_NAME/PhoenixShared.framework\"\necho \"SrcFrmk = $SrcFrmk\"\n\nDstFrmk=\"$BUILT_PRODUCTS_DIR/$FULL_PRODUCT_NAME\"\necho \"DstFrmk = $DstFrmk\"\n\necho \"rm -R $DstFrmk/Frameworks\"\nrm -R \"$DstFrmk/Frameworks\"\n\necho \"cp -R $SrcFrmk/ $DstFrmk/\"\ncp -R \"$SrcFrmk/\" \"$DstFrmk/\"\n\necho \"cp -R $SrcFrmk.dSYM/ $DstFrmk.dSYM/\"\ncp -R \"$SrcFrmk.dSYM/\" \"$DstFrmk.dSYM/\"\n";
shellScript = "cd \"$SRCROOT/..\"\necho ./gradlew embedAndSignAppleFrameworkForXcode\n./gradlew embedAndSignAppleFrameworkForXcode\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -2172,16 +2121,6 @@
target = 7555FF7A242A565900829871 /* phoenix-ios */;
targetProxy = 7555FF9D242A565B00829871 /* PBXContainerItemProxy */;
};
DC641C692820786600862DCD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DCB0DB82255AE42F005B29C8 /* phoenix-ios-framework */;
targetProxy = DC641C682820786600862DCD /* PBXContainerItemProxy */;
};
DCB0DBB0255AEE0E005B29C8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DCB0DB82255AE42F005B29C8 /* phoenix-ios-framework */;
targetProxy = DCB0DBAF255AEE0E005B29C8 /* PBXContainerItemProxy */;
};
DCB511CD281AED58001BC525 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DCB511C6281AED58001BC525 /* phoenix-notifySrvExt */;
Expand Down Expand Up @@ -2473,64 +2412,6 @@
};
name = Release;
};
DCB0DB8D255AE42F005B29C8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 84;
DEVELOPMENT_TEAM = XD77LN4376;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "phoenix-ios-framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "fr.acinq.phoenix-ios-framework";
PRODUCT_NAME = PhoenixShared;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
DCB0DB8E255AE42F005B29C8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 84;
DEVELOPMENT_TEAM = XD77LN4376;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "phoenix-ios-framework/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = "fr.acinq.phoenix-ios-framework";
PRODUCT_NAME = PhoenixShared;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
DCB511D0281AED58001BC525 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -2624,15 +2505,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DCB0DB8C255AE42F005B29C8 /* Build configuration list for PBXNativeTarget "phoenix-ios-framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DCB0DB8D255AE42F005B29C8 /* Debug */,
DCB0DB8E255AE42F005B29C8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DCB511CF281AED58001BC525 /* Build configuration list for PBXNativeTarget "phoenix-notifySrvExt" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down Expand Up @@ -2704,11 +2576,6 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
DC26D0B92A93BA8C006763B3 /* EffectsLibrary */ = {
isa = XCSwiftPackageProductDependency;
package = DC26D0B82A93BA8C006763B3 /* XCRemoteSwiftPackageReference "effects-library" */;
productName = EffectsLibrary;
};
DC26D0BA2A93BD0F006763B3 /* EffectsLibrary */ = {
isa = XCSwiftPackageProductDependency;
package = DC26D0B82A93BA8C006763B3 /* XCRemoteSwiftPackageReference "effects-library" */;
Expand All @@ -2734,11 +2601,6 @@
package = DC9B15422B7D0DCB0023743B /* XCRemoteSwiftPackageReference "swift-async-algorithms" */;
productName = AsyncAlgorithms;
};
DCA5391829F1DAA3001BD3D5 /* SegmentedPicker */ = {
isa = XCSwiftPackageProductDependency;
package = DCA5391729F1DAA3001BD3D5 /* XCRemoteSwiftPackageReference "SwiftySegmentedPicker" */;
productName = SegmentedPicker;
};
DCA5391929F1DDE7001BD3D5 /* SegmentedPicker */ = {
isa = XCSwiftPackageProductDependency;
package = DCA5391729F1DAA3001BD3D5 /* XCRemoteSwiftPackageReference "SwiftySegmentedPicker" */;
Expand Down
3 changes: 2 additions & 1 deletion phoenix-ios/phoenix-ios.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "653895f3cf5de8736e109a9ddd2552da4dbecc49c096d31ff1dcbb9c5314a3b4",
"pins" : [
{
"identity" : "abseil-cpp-swiftpm",
Expand Down Expand Up @@ -172,5 +173,5 @@
}
}
],
"version" : 2
"version" : 3
}
7 changes: 3 additions & 4 deletions phoenix-shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
if (System.getProperty("includeAndroid")?.toBoolean() == true) {
id("com.android.library")
}
id("co.touchlab.skie") version "0.8.1"
id("co.touchlab.skie") version "0.9.3"
}

val includeAndroid = System.getProperty("includeAndroid")?.toBoolean() ?: false
Expand Down Expand Up @@ -59,7 +59,7 @@ kotlin {
}
}

listOf(iosX64(), iosArm64()).forEach {
listOf(iosX64(), iosArm64(), iosSimulatorArm64()).forEach {
it.binaries {
framework {
optimized = false
Expand Down Expand Up @@ -89,7 +89,6 @@ kotlin {
dependencies {
// lightning-kmp
api("fr.acinq.lightning:lightning-kmp:${Versions.lightningKmp}")
api("fr.acinq.tor:tor-mobile-kmp:${Versions.torMobile}")
// ktor
implementation("io.ktor:ktor-client-core:${Versions.ktor}")
implementation("io.ktor:ktor-client-json:${Versions.ktor}")
Expand All @@ -99,7 +98,7 @@ kotlin {
implementation("app.cash.sqldelight:runtime:${Versions.sqlDelight}")
implementation("app.cash.sqldelight:coroutines-extensions:${Versions.sqlDelight}")
// SKEI
implementation("co.touchlab.skie:configuration-annotations:0.8.1")
implementation("co.touchlab.skie:configuration-annotations:0.9.3")
}
}

Expand Down
Loading