Sora にパッケージ名を変更

shiguredo · Feb 27, 2024 · 4992738 · 4992738
1 parent 2d5ec72
commit 4992738
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 9 deletions.
diff --git a/android/SoraAudioManager/.gitignore → android/Sora/.gitignore b/android/SoraAudioManager/.gitignore → android/Sora/.gitignore
diff --git a/android/SoraAudioManager/.idea/.gitignore → android/Sora/.idea/.gitignore b/android/SoraAudioManager/.idea/.gitignore → android/Sora/.idea/.gitignore
diff --git a/android/SoraAudioManager/.idea/compiler.xml → android/Sora/.idea/compiler.xml b/android/SoraAudioManager/.idea/compiler.xml → android/Sora/.idea/compiler.xml
diff --git a/android/SoraAudioManager/.idea/gradle.xml → android/Sora/.idea/gradle.xml b/android/SoraAudioManager/.idea/gradle.xml → android/Sora/.idea/gradle.xml
diff --git a/...ea/inspectionProfiles/Project_Default.xml → ...ea/inspectionProfiles/Project_Default.xml b/...ea/inspectionProfiles/Project_Default.xml → ...ea/inspectionProfiles/Project_Default.xml
diff --git a/...oid/SoraAudioManager/.idea/migrations.xml → android/Sora/.idea/migrations.xml b/...oid/SoraAudioManager/.idea/migrations.xml → android/Sora/.idea/migrations.xml
diff --git a/android/SoraAudioManager/.idea/misc.xml → android/Sora/.idea/misc.xml b/android/SoraAudioManager/.idea/misc.xml → android/Sora/.idea/misc.xml
diff --git a/...aAudioManager/SoraAudioManager/.gitignore → android/Sora/Sora/.gitignore b/...aAudioManager/SoraAudioManager/.gitignore → android/Sora/Sora/.gitignore
diff --git a/...udioManager/SoraAudioManager/build.gradle → android/Sora/Sora/build.gradle b/...udioManager/SoraAudioManager/build.gradle → android/Sora/Sora/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    namespace 'jp.shiguredo.sora.audiomanager'
+    namespace 'jp.shiguredo.sora'
     compileSdk 34
 
     defaultConfig {

diff --git a/...nager/SoraAudioManager/consumer-rules.pro → android/Sora/Sora/consumer-rules.pro b/...nager/SoraAudioManager/consumer-rules.pro → android/Sora/Sora/consumer-rules.pro
diff --git a/...nager/SoraAudioManager/proguard-rules.pro → android/Sora/Sora/proguard-rules.pro b/...nager/SoraAudioManager/proguard-rules.pro → android/Sora/Sora/proguard-rules.pro
diff --git a/...AudioManager/src/main/AndroidManifest.xml → ...id/Sora/Sora/src/main/AndroidManifest.xml b/...AudioManager/src/main/AndroidManifest.xml → ...id/Sora/Sora/src/main/AndroidManifest.xml
diff --git a/.../sora/audiomanager/MainThreadWrapper.java → .../sora/audiomanager/MainThreadWrapper.java b/.../sora/audiomanager/MainThreadWrapper.java → .../sora/audiomanager/MainThreadWrapper.java
diff --git a/...o/sora/audiomanager/SoraAudioManager.java → ...o/sora/audiomanager/SoraAudioManager.java b/...o/sora/audiomanager/SoraAudioManager.java → ...o/sora/audiomanager/SoraAudioManager.java
diff --git a/.../sora/audiomanager/SoraAudioManager2.java → .../sora/audiomanager/SoraAudioManager2.java b/.../sora/audiomanager/SoraAudioManager2.java → .../sora/audiomanager/SoraAudioManager2.java
diff --git a/...audiomanager/SoraAudioManagerFactory.java → ...audiomanager/SoraAudioManagerFactory.java b/...audiomanager/SoraAudioManagerFactory.java → ...audiomanager/SoraAudioManagerFactory.java
diff --git a/.../audiomanager/SoraAudioManagerLegacy.java → .../audiomanager/SoraAudioManagerLegacy.java b/.../audiomanager/SoraAudioManagerLegacy.java → .../audiomanager/SoraAudioManagerLegacy.java
diff --git a/...ra/audiomanager/SoraBluetoothManager.java → ...ra/audiomanager/SoraBluetoothManager.java b/...ra/audiomanager/SoraBluetoothManager.java → ...ra/audiomanager/SoraBluetoothManager.java
diff --git a/...do/sora/audiomanager/SoraThreadUtils.java → ...do/sora/audiomanager/SoraThreadUtils.java b/...do/sora/audiomanager/SoraThreadUtils.java → ...do/sora/audiomanager/SoraThreadUtils.java
diff --git a/android/SoraAudioManager/build.gradle.kts → android/Sora/build.gradle.kts b/android/SoraAudioManager/build.gradle.kts → android/Sora/build.gradle.kts
diff --git a/android/SoraAudioManager/gradle.properties → android/Sora/gradle.properties b/android/SoraAudioManager/gradle.properties → android/Sora/gradle.properties
diff --git a/...Manager/gradle/wrapper/gradle-wrapper.jar → ...id/Sora/gradle/wrapper/gradle-wrapper.jar b/...Manager/gradle/wrapper/gradle-wrapper.jar → ...id/Sora/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/android/SoraAudioManager/gradlew → android/Sora/gradlew b/android/SoraAudioManager/gradlew → android/Sora/gradlew
diff --git a/android/SoraAudioManager/gradlew.bat → android/Sora/gradlew.bat b/android/SoraAudioManager/gradlew.bat → android/Sora/gradlew.bat
diff --git a/android/SoraAudioManager/settings.gradle.kts → android/Sora/settings.gradle.kts b/android/SoraAudioManager/settings.gradle.kts → android/Sora/settings.gradle.kts
@@ -13,5 +13,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "SoraAudioManager"
-include(":SoraAudioManager")
+rootProject.name = "Sora"
+include(":Sora")
diff --git a/run.py b/run.py
@@ -1728,12 +1728,12 @@ def main():
                             os.path.join(install_dir, 'sora', 'lib', 'libsora.a'))
 
     if platform.target.os == 'android':
-        # Android の場合のみ SoraAudioManager をビルドする
-        with cd(os.path.join(BASE_DIR, 'android', 'SoraAudioManager')):
+        # Android の場合のみライブラリをビルドする
+        with cd(os.path.join(BASE_DIR, 'android', 'Sora')):
             cmd(['./gradlew', '--no-daemon', 'assembleRelease'])
-            shutil.copyfile(os.path.join(BASE_DIR, 'android', 'SoraAudioManager', 'SoraAudioManager',
-                                         'build', 'outputs', 'aar', 'SoraAudioManager-release.aar'),
-                            os.path.join(install_dir, 'sora', 'lib', 'SoraAudioManager.aar'))
+            shutil.copyfile(os.path.join(BASE_DIR, 'android', 'Sora', 'Sora',
+                                         'build', 'outputs', 'aar', 'Sora-release.aar'),
+                            os.path.join(install_dir, 'sora', 'lib', 'Sora.aar'))
 
     if args.test:
         if platform.target.os == 'ios':