diff --git a/.gitattributes b/.gitattributes index 69b47b5..8501712 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,4 @@ +* text eol=lf *.bat text eol=crlf +*.jar binary +*.jks binary diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe34a99..8acddc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,14 +13,14 @@ on: jobs: build: name: Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -46,13 +46,12 @@ jobs: export KEY_ALIAS="android" export KEY_PASSWORD="android" fi - ./gradlew aR --no-daemon - echo "commit=$(echo ${{ github.sha }} | cut -c 1-7)" >> $GITHUB_ENV - find app/{DchaSetupWizard,FirmwareUpdate}/build/outputs/apk/ -type f -name *.apk -exec mv {} app/ \; + ./gradlew aR --no-daemon + echo "commit=$(echo ${{ github.sha }} | cut -c-7)" >> $GITHUB_ENV - name: Upload built APKs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: CPadGApps_CT3-Built@${{ env.commit }} - path: app/*.apk + path: app/FirmwareUpdate/build/outputs/apk/FirmwareUpdate-release.apk if-no-files-found: ignore diff --git a/app/DchaSetupWizard/build.gradle b/app/DchaSetupWizard/build.gradle deleted file mode 100644 index 8ae720d..0000000 --- a/app/DchaSetupWizard/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -plugins { - id 'com.android.application' -} - -android { - compileSdk 28 - buildToolsVersion "30.0.3" - - defaultConfig { - applicationId 'jp.co.benesse.dcha.setupwizard' - minSdk 24 - //noinspection ExpiredTargetSdkVersion - targetSdk 24 - versionCode 2 - versionName "1.0.1" - } - - signingConfigs { - release { - storeFile rootProject.file('app/release.jks') - storePassword System.getenv('STORE_PASSWORD') - keyAlias System.getenv('KEY_ALIAS') - keyPassword System.getenv('KEY_PASSWORD') - } - } - - buildTypes { - debug { - debuggable false - signingConfig signingConfigs.release - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - release { - signingConfig signingConfigs.release - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} diff --git a/app/DchaSetupWizard/proguard-rules.pro b/app/DchaSetupWizard/proguard-rules.pro deleted file mode 100644 index bce3b62..0000000 --- a/app/DchaSetupWizard/proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ -#-printconfiguration build/outputs/mapping/release/configuration.txt diff --git a/app/DchaSetupWizard/src/main/AndroidManifest.xml b/app/DchaSetupWizard/src/main/AndroidManifest.xml deleted file mode 100644 index 73dd20a..0000000 --- a/app/DchaSetupWizard/src/main/AndroidManifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/app/DchaSetupWizard/src/main/java/jp/co/benesse/dcha/setupwizard/StartWidget.java b/app/DchaSetupWizard/src/main/java/jp/co/benesse/dcha/setupwizard/StartWidget.java deleted file mode 100644 index 93448a4..0000000 --- a/app/DchaSetupWizard/src/main/java/jp/co/benesse/dcha/setupwizard/StartWidget.java +++ /dev/null @@ -1,21 +0,0 @@ -package jp.co.benesse.dcha.setupwizard; - -import android.annotation.SuppressLint; -import android.app.PendingIntent; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.Context; -import android.content.Intent; -import android.widget.RemoteViews; - -public class StartWidget extends AppWidgetProvider { - @SuppressLint("UnspecifiedImmutableFlag") - public void onUpdate (Context c, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - RemoteViews remoteViews = new RemoteViews(c.getPackageName(), R.layout.widget); - Intent p = new Intent(Intent.ACTION_MAIN); - p.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - p.setClassName("com.android.vending", "com.android.vending.AssetBrowserActivity"); - remoteViews.setOnClickPendingIntent(R.id.widget_btn, PendingIntent.getActivity(c, 0, p, 0)); - appWidgetManager.updateAppWidget(appWidgetIds, remoteViews); - } -} diff --git a/app/DchaSetupWizard/src/main/res/drawable-mdpi/cs00301040.png b/app/DchaSetupWizard/src/main/res/drawable-mdpi/cs00301040.png deleted file mode 100644 index 39f18f5..0000000 Binary files a/app/DchaSetupWizard/src/main/res/drawable-mdpi/cs00301040.png and /dev/null differ diff --git a/app/DchaSetupWizard/src/main/res/layout/widget.xml b/app/DchaSetupWizard/src/main/res/layout/widget.xml deleted file mode 100644 index 6e3f895..0000000 --- a/app/DchaSetupWizard/src/main/res/layout/widget.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/DchaSetupWizard/src/main/res/xml/appwidget.xml b/app/DchaSetupWizard/src/main/res/xml/appwidget.xml deleted file mode 100644 index 891e21b..0000000 --- a/app/DchaSetupWizard/src/main/res/xml/appwidget.xml +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/app/FirmwareUpdate/build.gradle b/app/FirmwareUpdate/build.gradle index 0af67cd..71e33eb 100644 --- a/app/FirmwareUpdate/build.gradle +++ b/app/FirmwareUpdate/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 28 + compileSdk 33 buildToolsVersion "30.0.3" defaultConfig { @@ -29,12 +29,12 @@ android { debuggable false signingConfig signingConfigs.release minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles += 'proguard-rules.pro' } release { signingConfig signingConfigs.release minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles += 'proguard-rules.pro' } } } diff --git a/app/FirmwareUpdate/proguard-rules.pro b/app/FirmwareUpdate/proguard-rules.pro index bce3b62..5a21d62 100644 --- a/app/FirmwareUpdate/proguard-rules.pro +++ b/app/FirmwareUpdate/proguard-rules.pro @@ -1 +1 @@ -#-printconfiguration build/outputs/mapping/release/configuration.txt +-keep class ** diff --git a/docs/MODULE.md b/docs/MODULE.md index 43ae40b..65e9d4c 100644 --- a/docs/MODULE.md +++ b/docs/MODULE.md @@ -6,7 +6,7 @@ Googleサービスの追加やDcha系の削除､ 端末管理機能等の機能 モジュールID：**CPadGApps-CT3** -バージョン：v1.7.1 +バージョン：v1.8.0 Magiskは***必ず [v23.0](https://cdn.jsdelivr.net/gh/topjohnwu/magisk-files@23.0/app-release.apk)*** を使用して下さい｡
SafetyNetを通したり､一部アプリを動作させるためには**MagiskHide**の機能が必要です｡ @@ -29,11 +29,7 @@ OpenGApps : 20220215 ## アプリ -- **Chrome** - **ConfigUpdater** -- **DchaSetupWizard** - - 簡単に**Play ストア**を起動できます｡ -- **Files** - **FirmwareUpdate** - 設定アプリからアクティビティを立ち上げた際に
設定アプリがクラッシュするのを防ぎます｡ - **GmsCore** @@ -44,12 +40,8 @@ OpenGApps : 20220215 - **GoogleOneTimeInitializer** - **GooglePartnerSetup** - **GoogleServicesFramework** -- **GoogleTTS** -- **iWnnIME_oldskin** (更新) - **Phonesky** -- **Photos** - **WallpaperPickerGoogle** -- **WebViewGoogle** (更新)
削除 @@ -59,22 +51,8 @@ OpenGApps : 20220215 - **DchaDataBox** - **DchaService** - **DchaSystemSettings** -- **Gallery2** -- **Gallery2Drm** -- **Gallery2Gif** -- **Gallery2PhotoPicker** -- **Gallery2Pq** -- **Gallery2PqTool** -- **Gallery2Raw** -- **Gallery2Root** -- **Gallery2StereoBackground** -- **Gallery2StereoCopyPaste** -- **Gallery2StereoFancyColor** -- **Gallery2StereoRefocus** -- **MtkBrowser** - **OneTimeInitializer** - **PicoTts** -- **QuickSearchBox**
あえて追加しなかったもの @@ -92,12 +70,4 @@ OpenGApps : 20220215 - **YouTube** 及び **YouTube Music** - ReVanced などの拡張アプリもあるため -
その他注意事項 - -## TestDPCを利用する場合 -[**TestDPC**](https://github.com/googlesamples/android-testdpc "googlesamples/android-testdpc")を利用する場合は、**必ず**バージョンが｢[**7.0.2**](https://github.com/googlesamples/android-testdpc/releases/tag/v7.0.2 "Release TestDPC 7.0.2 · googlesamples/android-testdpc")｣のものを利用し､絶対に更新を行わないでください｡ -"**Set user restrictions**"が開けなくなります｡ -Play ストアでの自動更新機能をオフにする事を強く推奨致します｡ -[**ここ**](https://github.com/s1204IT/TestDPC)からGradleでビルドすると､ 最新バージョンでも問題なく動作します｡ -
diff --git a/settings.gradle b/settings.gradle index efdeab6..6406e17 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ -include 'app', 'FirmwareUpdate', 'DchaSetupWizard' +include 'app', 'FirmwareUpdate' def buildDir = project(':app').projectDir project(':FirmwareUpdate').projectDir = new File(buildDir, 'FirmwareUpdate') -project(':DchaSetupWizard').projectDir = new File(buildDir, 'DchaSetupWizard')