Skip to content

Commit 7fa2ff0

Browse files
maotoumaomaotoumao
authored
Publish v0.5.0
Publish v0.5.0
2 parents cbd214f + ed06738 commit 7fa2ff0

File tree

97 files changed

+3293
-3394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3293
-3394
lines changed

‎.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
module.exports = {
22
root: true,
3-
extends: '@react-native',
3+
extends: ['@react-native', 'prettier'],
44
overrides: [
55
{
66
files: ['*.ts', '*.tsx'],
77
rules: {
88
'@typescript-eslint/no-shadow': 'warn',
99
'no-shadow': 'off',
1010
'no-undef': 'off',
11-
'prettier/prettier': 'error',
1211
'react-hooks/exhaustive-deps': 'warn',
1312
},
1413
},

‎Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
44
ruby ">= 2.6.10"
55

6-
# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
7-
# bound in the template on Cocoapods with next React Native release.
8-
gem 'cocoapods', '>= 1.13', '< 1.15'
9-
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
6+
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
7+
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
8+
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'

‎android/app/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import groovy.json.JsonSlurper
1212
*/
1313
react {
1414
/* Folders */
15-
// The root of your project, i.e. where "package.json" lives. Default is '..'
16-
// root = file("../")
17-
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
18-
// reactNativeDir = file("../node_modules/react-native")
19-
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
20-
// codegenDir = file("../node_modules/@react-native/codegen")
21-
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
22-
// cliFile = file("../node_modules/react-native/cli.js")
15+
// The root of your project, i.e. where "package.json" lives. Default is '../..'
16+
// root = file("../../")
17+
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
18+
// reactNativeDir = file("../../node_modules/react-native")
19+
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
20+
// codegenDir = file("../../node_modules/@react-native/codegen")
21+
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
22+
// cliFile = file("../../node_modules/react-native/cli.js")
2323

2424
/* Variants */
2525
// The list of variants to that are debuggable. For those we're going to
@@ -53,11 +53,20 @@ react {
5353
//
5454
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5555
// hermesFlags = ["-O", "-output-source-map"]
56+
57+
/* Autolinking */
58+
autolinkLibrariesWithApp()
59+
5660
//
5761
// Added by install-expo-modules
5862
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
5963
cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
6064
bundleCommand = "export:embed"
65+
//
66+
// Added by install-expo-modules
67+
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
68+
cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
69+
bundleCommand = "export:embed"
6170
}
6271

6372
/**
@@ -179,4 +188,3 @@ dependencies {
179188
implementation 'net.jthink:jaudiotagger:2.2.5'
180189
}
181190

182-
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

‎android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
android:roundIcon="@mipmap/ic_launcher_round"
1818
android:allowBackup="false"
1919
android:theme="@style/AppTheme"
20+
android:supportsRtl="true"
2021
android:requestLegacyExternalStorage="true"
2122
android:usesCleartextTraffic="true"
2223
android:extractNativeLibs="true"

‎android/app/src/main/java/fun/upup/musicfree/MainActivity.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.facebook.react.ReactActivity
55
import com.facebook.react.ReactActivityDelegate
66
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
77
import com.facebook.react.defaults.DefaultReactActivityDelegate
8+
import android.os.Bundle
89

910
class MainActivity : ReactActivity() {
1011

@@ -20,4 +21,9 @@ class MainActivity : ReactActivity() {
2021
*/
2122
override fun createReactActivityDelegate(): ReactActivityDelegate =
2223
ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
24+
25+
// https://reactnavigation.org/docs/getting-started/#installing-dependencies-into-a-bare-react-native-project
26+
override fun onCreate(savedInstanceState: Bundle?) {
27+
super.onCreate(null);
28+
}
2329
}

‎android/app/src/main/java/fun/upup/musicfree/MainApplication.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.facebook.react.ReactPackage
1212
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1313
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1414
import com.facebook.react.defaults.DefaultReactNativeHost
15+
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1516
import com.facebook.soloader.SoLoader
1617
import `fun`.upup.musicfree.lyricUtil.LyricUtilPackage
1718
import `fun`.upup.musicfree.mp3Util.Mp3UtilPackage
@@ -43,7 +44,7 @@ class MainApplication : Application(), ReactApplication {
4344

4445
override fun onCreate() {
4546
super.onCreate()
46-
SoLoader.init(this, false)
47+
SoLoader.init(this, OpenSourceMergedSoMapping)
4748
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
4849
// If you opted-in for the New Architecture, we load the native entry point for this app.
4950
load()

‎android/app/src/main/java/fun/upup/musicfree/utils/UtilsModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ class UtilsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule
5151
}
5252
reactContext.currentActivity?.startActivity(intent)
5353
}
54-
}
54+
}

‎android/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 23
5-
compileSdkVersion = 34
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 24
5+
compileSdkVersion = 35
66
targetSdkVersion = 30
77
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.22"
8+
kotlinVersion = "1.9.24"
99
}
1010
repositories {
11+
maven { url 'https://maven.aliyun.com/repository/public' }
12+
maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
1113
google()
1214
mavenCentral()
15+
maven { url 'https://jitpack.io' }
1316
}
1417
dependencies {
1518
classpath("com.android.tools.build:gradle")
1619
classpath("com.facebook.react:react-native-gradle-plugin")
1720
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
1821
}
1922
}
20-
2123
apply plugin: "com.facebook.react.rootproject"

‎android/gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
2121
# Android operating system, and which are packaged with your app's APK
2222
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2323
android.useAndroidX=true
24-
# Automatically convert third-party libraries to use AndroidX
25-
android.enableJetifier=true
2624

2725
# Use this property to specify which architecture you want to build.
2826
# You can also override it from the CLI using

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
3+
# distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
4+
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.10.2-all.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

‎android/gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎android/gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎android/settings.gradle

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
1+
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
2+
plugins { id("com.facebook.react.settings") }
3+
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex ->
4+
def command = [
5+
'node',
6+
'--no-warnings',
7+
'--eval',
8+
'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))',
9+
'react-native-config',
10+
'--json',
11+
'--platform',
12+
'android'
13+
].toList()
14+
ex.autolinkLibrariesFromCommand(command)
15+
}
116
rootProject.name = 'MusicFree'
2-
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
317
include ':app'
418
includeBuild('../node_modules/@react-native/gradle-plugin')
519

620
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
7-
useExpoModules()
21+
useExpoModules()

‎babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
presets: ['module:@react-native/babel-preset'],
2+
presets: ['babel-preset-expo'],
33
plugins: [
44
[
55
'module-resolver',

‎changelog.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
`2024.11.10 v0.4.4`
1+
`2025.2.9 v0.5.0`
2+
1. 【升级】升级ReactNative到0.76.5（注意：升级后只支持安卓7.0及以上设备，低于此版本的设备请不要升级）
3+
2. 【修复】修复了运行应用一段时间后容易闪退的问题
4+
3. 【修复】修复了插件网络请求无法传递cookie的问题
5+
4. 【修复】新增了设置本地歌单封面的功能（在0.4版本暂时下线了）
6+
5. 【修复】修复了部分情况下，播放本地音乐提示 “当前非Wifi环境” 的问题
7+
6. 【优化】优化了一些代码逻辑
8+
9+
`2024.11.10 v0.4.4`
210
【修复】修复了部分系统上弹窗、浮层等无法出现，或动画表现异常的问题
311

4-
`2024.10.27 v0.4.3`
12+
`2024.10.27 v0.4.3`
513
【修复】修复了部分系统上文字显示不全的问题
614

715
`2024.9.18 v0.4.2`

‎ios/MusicFree.xcodeproj/project.pbxproj

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@
420420
"$(inherited)",
421421
);
422422
INFOPLIST_FILE = MusicFreeTests/Info.plist;
423-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
423+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
424424
LD_RUNPATH_SEARCH_PATHS = (
425425
"$(inherited)",
426426
"@executable_path/Frameworks",
@@ -434,6 +434,7 @@
434434
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
435435
PRODUCT_NAME = "$(TARGET_NAME)";
436436
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MusicFree.app/MusicFree";
437+
SWIFT_VERSION = 5.0;
437438
};
438439
name = Debug;
439440
};
@@ -444,7 +445,7 @@
444445
BUNDLE_LOADER = "$(TEST_HOST)";
445446
COPY_PHASE_STRIP = NO;
446447
INFOPLIST_FILE = MusicFreeTests/Info.plist;
447-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
448+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
448449
LD_RUNPATH_SEARCH_PATHS = (
449450
"$(inherited)",
450451
"@executable_path/Frameworks",
@@ -458,6 +459,7 @@
458459
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
459460
PRODUCT_NAME = "$(TARGET_NAME)";
460461
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MusicFree.app/MusicFree";
462+
SWIFT_VERSION = 5.0;
461463
};
462464
name = Release;
463465
};
@@ -470,6 +472,7 @@
470472
CURRENT_PROJECT_VERSION = 1;
471473
ENABLE_BITCODE = NO;
472474
INFOPLIST_FILE = MusicFree/Info.plist;
475+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
473476
LD_RUNPATH_SEARCH_PATHS = (
474477
"$(inherited)",
475478
"@executable_path/Frameworks",
@@ -496,6 +499,7 @@
496499
CLANG_ENABLE_MODULES = YES;
497500
CURRENT_PROJECT_VERSION = 1;
498501
INFOPLIST_FILE = MusicFree/Info.plist;
502+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
499503
LD_RUNPATH_SEARCH_PATHS = (
500504
"$(inherited)",
501505
"@executable_path/Frameworks",
@@ -562,7 +566,7 @@
562566
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
563567
GCC_WARN_UNUSED_FUNCTION = YES;
564568
GCC_WARN_UNUSED_VARIABLE = YES;
565-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
569+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
566570
LD_RUNPATH_SEARCH_PATHS = (
567571
/usr/lib/swift,
568572
"$(inherited)",
@@ -583,6 +587,7 @@
583587
"-DFOLLY_HAVE_CLOCK_GETTIME=1",
584588
);
585589
SDKROOT = iphoneos;
590+
SWIFT_VERSION = 5.0;
586591
};
587592
name = Debug;
588593
};
@@ -628,7 +633,7 @@
628633
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
629634
GCC_WARN_UNUSED_FUNCTION = YES;
630635
GCC_WARN_UNUSED_VARIABLE = YES;
631-
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
636+
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
632637
LD_RUNPATH_SEARCH_PATHS = (
633638
/usr/lib/swift,
634639
"$(inherited)",
@@ -649,6 +654,7 @@
649654
);
650655
SDKROOT = iphoneos;
651656
VALIDATE_PRODUCT = YES;
657+
SWIFT_VERSION = 5.0;
652658
};
653659
name = Release;
654660
};

‎ios/MusicFree/PrivacyInfo.xcprivacy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>NSPrivacyCollectedDataTypes</key>
6-
<array>
7-
</array>
85
<key>NSPrivacyAccessedAPITypes</key>
96
<array>
107
<dict>
@@ -32,6 +29,8 @@
3229
</array>
3330
</dict>
3431
</array>
32+
<key>NSPrivacyCollectedDataTypes</key>
33+
<array/>
3534
<key>NSPrivacyTracking</key>
3635
<false/>
3736
</dict>

‎ios/Podfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,23 @@ target 'MusicFree' do
2424
Pod::UI.warn e
2525
end
2626
end
27-
config = use_native_modules!
28-
27+
if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
28+
config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"];
29+
else
30+
config_command = [
31+
'node',
32+
'--no-warnings',
33+
'--eval',
34+
'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))',
35+
'react-native-config',
36+
'--json',
37+
'--platform',
38+
'ios'
39+
]
40+
end
41+
42+
config = use_native_modules!(config_command)
43+
2944
use_react_native!(
3045
:path => config[:reactNativePath],
3146
# An absolute path to your application root.

0 commit comments

Comments
 (0)