v2.0.0

.gitattributes

@@ -1 +1,4 @@
+* text=auto eol=lf
 *.bat text eol=crlf
+*.jar binary
+*.jks binary

.github/workflows/build.yml

@@ -4,7 +4,8 @@ on:
   push:
     paths:
       - '.github/workflows/build.yml'
-      - 'app/**'
+      - 'DchaSetupWizard/**'
+      - 'FirmwareUpdate/**'
       - 'gradle/**'
       - '*.gradle'
       - 'gradlew*'
@@ -13,46 +14,43 @@ 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'
+          java-version: '11'
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches/
             ~/.gradle/wrapper/
             .gradle/
           key: ${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
 
+      - name: Set signing configs
+        if: github.event.repository.fork != true
+        run: |
+          echo "${{ secrets.STORE_FILE }}" | base64 -d > release.jks
+          export STORE_PASSWORD="${{ secrets.STORE_PASSWORD }}"
+          export KEY_ALIAS="${{ secrets.KEY_ALIAS }}"
+          export KEY_PASSWORD="${{ secrets.KEY_PASSWORD }}"
+
       - name: Build with Gradle
         run: |
-          if [[ -n "${{ secrets.STORE_FILE }}" && -n "${{ secrets.STORE_PASSWORD }}" && -n "${{ secrets.KEY_ALIAS }}" && -n "${{ secrets.KEY_PASSWORD }}" ]]; then
-            echo "${{ secrets.STORE_FILE }}" | base64 -d > app/release.jks
-            export STORE_PASSWORD="${{ secrets.STORE_PASSWORD }}"
-            export KEY_ALIAS="${{ secrets.KEY_ALIAS }}"
-            export KEY_PASSWORD="${{ secrets.KEY_PASSWORD }}"
-          else
-            export STORE_PASSWORD="android"
-            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/ \;
-
-      - name: Upload built APKs
-        uses: actions/upload-artifact@v3
+          ./gradlew aR --no-daemon
+          echo "commit=$(echo ${{ github.sha }} | cut -c-7)" >> $GITHUB_ENV
+          find {DchaSetupWizard,FirmwareUpdate}/build/outputs/apk/ -type f -name *.apk -exec mv {} . \;
+
+      - name: Upload built APK
+        uses: actions/upload-artifact@v4
         with:
-          name: CPadGApps_CT3-Built@${{ env.commit }}
-          path: app/*.apk
-          if-no-files-found: ignore
+          name: CPadGApps-CT3@${{ env.commit }}
+          path: ./*.apk

.gitignore

@@ -1,4 +1,5 @@
-/.gradle
+/.gradle/
 /local.properties
-/.idea
-/app/**/build/
+/.idea/
+build/
+/release.jks

DchaSetupWizard/build.gradle

@@ -0,0 +1,48 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdk 33
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        applicationId 'jp.co.benesse.dcha.setupwizard'
+        minSdk 24
+        //noinspection ExpiredTargetSdkVersion
+        targetSdk 24
+        versionCode 1
+        versionName "1.0.0"
+        proguardFiles += 'proguard-rules.pro'
+    }
+
+    signingConfigs {
+        android {
+            storeFile rootProject.file('android.jks')
+            storePassword 'android'
+            keyAlias 'android'
+            keyPassword 'android'
+        }
+        release {
+            storeFile rootProject.file('release.jks')
+            storePassword System.getenv('STORE_PASSWORD')
+            keyAlias System.getenv('KEY_ALIAS')
+            keyPassword System.getenv('KEY_PASSWORD')
+        }
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+            signingConfig signingConfigs.android
+        }
+        release {
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.android
+            if (rootProject.file('release.jks').exists()) {
+                signingConfig signingConfigs.release
+            }
+        }
+    }
+}

DchaSetupWizard/proguard-rules.pro

@@ -0,0 +1 @@
+-ignorewarnings

app/DchaSetupWizard/src/main/AndroidManifest.xml → DchaSetupWizard/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="jp.co.benesse.dcha.setupwizard">
-    <application android:label="DchaSetupWizard">
+    <application
+        android:label="DchaSetupWizard"
+        android:theme="@android:style/Theme.NoDisplay">
         <receiver android:name=".StartWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

FirmwareUpdate/build.gradle

@@ -0,0 +1,48 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdk 34
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        applicationId 'com.panasonic.sanyo.ts.firmwareupdate'
+        minSdk 24
+        //noinspection ExpiredTargetSdkVersion
+        targetSdk 24
+        versionCode 1
+        versionName "1.0.0"
+        proguardFiles += 'proguard-rules.pro'
+    }
+
+    signingConfigs {
+        android {
+            storeFile rootProject.file('android.jks')
+            storePassword 'android'
+            keyAlias 'android'
+            keyPassword 'android'
+        }
+        release {
+            storeFile rootProject.file('release.jks')
+            storePassword System.getenv('STORE_PASSWORD')
+            keyAlias System.getenv('KEY_ALIAS')
+            keyPassword System.getenv('KEY_PASSWORD')
+        }
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false
+            signingConfig signingConfigs.android
+        }
+        release {
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.android
+            if (rootProject.file('release.jks').exists()) {
+                signingConfig signingConfigs.release
+            }
+        }
+    }
+}

FirmwareUpdate/proguard-rules.pro

@@ -0,0 +1 @@
+-ignorewarnings

app/FirmwareUpdate/src/main/AndroidManifest.xml → FirmwareUpdate/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.panasonic.sanyo.ts.firmwareupdate">
-    <application>
+    <application android:theme="@android:style/Theme.NoDisplay">
         <activity
             android:name=".FirmwareUpdateActivity"
             android:exported="true">

FirmwareUpdate/src/main/java/com/panasonic/sanyo/ts/firmwareupdate/FirmwareUpdateActivity.java

@@ -0,0 +1,16 @@
+package com.panasonic.sanyo.ts.firmwareupdate;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Toast;
+
+public class FirmwareUpdateActivity extends Activity {
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    finishAndRemoveTask();
+    Toast.makeText(this, "ファームウェアアップデートはサポートされていません｡", Toast.LENGTH_SHORT).show();
+  }
+
+}