提交: 2fc7e32b305dc100a8ea32906830b6e7c2ede7e1 - android_notepad (git)

Simple Notepad Application for Android OS

Commit MetaInfo

• 修订版: 2fc7e32b305dc100a8ea32906830b6e7c2ede7e1 (tree)
• 时间: 2018-11-04 01:32:12
• 作者: Masahiko, SAWAI <say@user...>
• Commiter: Masahiko, SAWAI

Log Message

Updated the app version from 1.0.14 to 1.0.15

更改概述

• modified: Makefile
• modified: notepad-app-level-11/pom.xml
• modified: notepad-app-level-11/src/main/AndroidManifest.xml
• modified: notepad-app/pom.xml
• modified: notepad-app/src/main/AndroidManifest.xml
• modified: notepad-common/pom.xml
• modified: pom.xml

差异

--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ site :
 
 #################### project
 dist : 
-	mvn assembly:assembly
+	mvn assembly:single
 
 clean : 
 	mvn $@

--- a/notepad-app-level-11/pom.xml
+++ b/notepad-app-level-11/pom.xml
@@ -8,13 +8,13 @@
 	<groupId>org.routine_work</groupId>
 	<artifactId>notepad-app-level-11</artifactId>
 	<packaging>apk</packaging>
-	<version>1.0.14</version>
+	<version>1.0.15</version>
 	<name>Notepad App Level 11</name>
 
 	<parent>
 		<groupId>org.routine_work</groupId>
 		<artifactId>notepad-project</artifactId>
-		<version>1.0.14</version>
+		<version>1.0.15</version>
 	</parent>
 
 	<dependencies>
@@ -22,16 +22,10 @@
 		<dependency>
 			<groupId>android</groupId>
 			<artifactId>android</artifactId>
-			<version>6.0_r3</version>
+			<version>8.0.0_r2</version>
 			<!--
-			<version>1.5_r3</version>
-			<version>1.5_r4</version>
-			<version>1.6_r2</version>
-			<version>2.1.2</version>
-			<version>2.1_r1</version>
-			<version>2.2.1</version>
-			<version>2.3.1</version>
-			<version>2.3.3</version>
+			<version>6.0_r3</version>
+			<version>7.1.1_r3</version>
 			-->
 			<scope>provided</scope>
 		</dependency>
@@ -39,7 +33,7 @@
 		<dependency>
 			<groupId>org.routine_work</groupId>
 			<artifactId>notepad-common</artifactId>
-			<version>1.0.14</version>
+			<version>1.0.15</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -60,7 +54,7 @@
 					<sdk>
 						<path>${env.ANDROID_HOME}</path>
 						<!-- <path>C:/Java/android-sdk</path> -->
-						<platform>23</platform>
+						<platform>26</platform>
 					</sdk>
 					<release>false</release>
 					<proguard>

--- a/notepad-app-level-11/src/main/AndroidManifest.xml
+++ b/notepad-app-level-11/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.routine_work.notepad"
-	android:versionCode="39"
-	android:versionName="1.0.14"
+	android:versionCode="41"
+	android:versionName="1.0.15"
 	android:installLocation="auto"
 >
 	<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="25" /> <!-- Android 7.1 -->

--- a/notepad-app/pom.xml
+++ b/notepad-app/pom.xml
@@ -8,13 +8,13 @@
 	<groupId>org.routine_work</groupId>
 	<artifactId>notepad-app</artifactId>
 	<packaging>apk</packaging>
-	<version>1.0.14</version>
+	<version>1.0.15</version>
 	<name>Notepad App</name>
 
 	<parent>
 		<groupId>org.routine_work</groupId>
 		<artifactId>notepad-project</artifactId>
-		<version>1.0.14</version>
+		<version>1.0.15</version>
 	</parent>
 
 	<dependencies>
@@ -39,7 +39,7 @@
 		<dependency>
 			<groupId>org.routine_work</groupId>
 			<artifactId>notepad-common</artifactId>
-			<version>1.0.14</version>
+			<version>1.0.15</version>
 			<scope>compile</scope>
 		</dependency>
 

--- a/notepad-app/src/main/AndroidManifest.xml
+++ b/notepad-app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.routine_work.notepad"
-	android:versionCode="38"
-	android:versionName="1.0.14"
+	android:versionCode="40"
+	android:versionName="1.0.15"
 	android:installLocation="auto"
 >
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />

--- a/notepad-common/pom.xml
+++ b/notepad-common/pom.xml
@@ -8,13 +8,13 @@
 	<groupId>org.routine_work</groupId>
 	<artifactId>notepad-common</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.14</version>
+	<version>1.0.15</version>
 	<name>Notepad Common Library</name>
 
 	<parent>
 		<groupId>org.routine_work</groupId>
 		<artifactId>notepad-project</artifactId>
-		<version>1.0.14</version>
+		<version>1.0.15</version>
 	</parent>
 
 	<dependencies>

--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>org.routine_work</groupId>
 	<artifactId>notepad-project</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.14</version>
+	<version>1.0.15</version>
 	<name>Notepad Project</name>
 	<url>http://sourceforge.jp/users/say/pf/android_notepad/scm/</url>
 
@@ -34,13 +34,13 @@
 				<plugin>
 					<groupId>com.simpligility.maven.plugins</groupId>
 					<artifactId>android-maven-plugin</artifactId>
-					<version>4.4.1</version> <!-- use latest release -->
+					<version>4.5.0</version> <!-- use latest release -->
 					<extensions>true</extensions>
 					<dependencies>
 						<dependency>
 							<groupId>net.sf.proguard</groupId>
 							<artifactId>proguard-base</artifactId>
-							<version>5.2.1</version>
+							<version>6.0.3</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -50,7 +50,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.8.0</version>
 
 					<configuration>
 						<source>1.5</source>
@@ -74,7 +74,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.1.0</version>
 
 					<configuration>
 						<descriptorRefs>
@@ -99,13 +99,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>2.9</version>
+					<version>3.0.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.3</version>
+					<version>3.0.1</version>
 
 					<configuration>
 						<locale>en</locale>
@@ -121,7 +121,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.7.1</version>
 
 					<configuration>
 						<locales>en</locales>